From aab43b1c07e98576001f6713fc16a0fe41323dd7 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 2 Dec 2021 20:00:45 +0800 Subject: [PATCH] flake: unbreak Windows library link (WIP) --- flake.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 8147ae76..a476cdb9 100644 --- a/flake.nix +++ b/flake.nix @@ -68,12 +68,19 @@ name = "nac3artiq"; src = self; inherit cargoSha256; - buildInputs = [ pkgs-mingw.libffi ]; + buildInputs = [ pkgs-mingw.libffi pkgs-mingw.zlib pkgs-mingw.windows.mcfgthreads ]; configurePhase = '' export PYO3_CONFIG_FILE=${pyo3-mingw-config} + mkdir llvm-cfg - ln -s ${pkgs-mingw.llvm_12.dev}/bin/llvm-config-native llvm-cfg/llvm-config + cat << EOF > llvm-cfg/llvm-config + #!${pkgs.bash}/bin/bash + set -e + # gross hack to work around llvm-config asking for the wrong system libraries + exec ${pkgs-mingw.llvm_12.dev}/bin/llvm-config-native \$@ | ${pkgs.gnused}/bin/sed s/-lrt\ -ldl/-lmcfgthread\ -lz/ + EOF + chmod +x llvm-cfg/llvm-config export PATH=$PATH:`pwd`/llvm-cfg ''; cargoBuildFlags = [ "--package" "nac3artiq" ];