diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-12 08:14:37 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-12 08:14:37 +0000 |
| commit | 7d648ac22d941d0c7efdd987315ae0ddf9932ba0 (patch) | |
| tree | 51a3e8126722c5a52a9a1e7e40b4eeaf4610db0b /nixpkgs/pkgs/build-support/cc-wrapper/default.nix | |
| parent | aa4353b499e6950b7333578f936455a628145c31 (diff) | |
| parent | db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b (diff) | |
| download | nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.gz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.bz2 nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.lz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.xz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.zst nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/build-support/cc-wrapper/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/build-support/cc-wrapper/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index f52ac48a1a87..8412aabfe5fa 100644 --- a/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -332,7 +332,16 @@ stdenv.mkDerivation { setupHooks = [ ../setup-hooks/role.bash ] ++ lib.optional (cc.langC or true) ./setup-hook.sh - ++ lib.optional (cc.langFortran or false) ./fortran-hook.sh; + ++ lib.optional (cc.langFortran or false) ./fortran-hook.sh + ++ lib.optional (targetPlatform.isWindows) (stdenv.mkDerivation { + name = "win-dll-hook.sh"; + dontUnpack = true; + installPhase = '' + echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib" > $out + echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib64" >> $out + echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib32" >> $out + ''; + }); postFixup = # Ensure flags files exists, as some other programs cat them. (That these |