From cffce1140a8fe46a04bae44b5f54ba56eec019e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Sat, 23 Nov 2024 20:47:12 +0100
Subject: [PATCH] try to fix windows build

---
 default.nix | 4 ++--
 package.nix | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/default.nix b/default.nix
index 487a246b..14df74b8 100644
--- a/default.nix
+++ b/default.nix
@@ -68,10 +68,10 @@ himalaya.overrideAttrs (drv: {
     tar -czf himalaya.tgz himalaya* share
     mv himalaya.tgz ../
 
-    ${hostPkgs.zip}/bin/zip -r himalaya.zip himalaya* share
+    ${pkgs.zip}/bin/zip -r himalaya.zip himalaya* share
     mv himalaya.zip ../
   '';
-  src = hostPkgs.nix-gitignore.gitignoreSource [ ] ./.;
+  src = pkgs.nix-gitignore.gitignoreSource [ ] ./.;
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ./Cargo.lock;
     allowBuiltinFetchGit = true;
diff --git a/package.nix b/package.nix
index 4dbd07cf..cf4b7edd 100644
--- a/package.nix
+++ b/package.nix
@@ -30,9 +30,11 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-YS8IamapvmdrOPptQh2Ef9Yold0IK1XIeGs0kDIQ5b8=";
 
-  NIX_BUILD_CORES = 4;
-  CARGO_TARGET_LINKER = "${stdenv.cc.targetPrefix}cc";
-  CARGO_BUILD_RUSTFLAGS = [ "-Ctarget-feature=+crt-static" ];
+  # NIX_BUILD_CORES = 4;
+  "CARGO_TARGET_${builtins.replaceStrings ["-"] ["_"] (lib.strings.toUpper stdenv.hostPlatform.config)}_LINKER" = "${stdenv.cc.targetPrefix}cc";
+  # TARGET_CC = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
+  # CARGO_BUILD_RUSTFLAGS = [ "-Ctarget-feature=+crt-static" ];
+  CARGO_CFG_TARGET_FEATURE = "crt-static";
 
   doCheck = false;
   cargoTestFlags = [