try to fix windows build

This commit is contained in:
Clément DOUIN
2024-11-23 20:47:12 +01:00
parent c4ae8626ed
commit cffce1140a
2 changed files with 7 additions and 5 deletions
+2 -2
View File
@@ -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;
+5 -3
View File
@@ -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 = [