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/development/compilers/gcc/common/builder.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/development/compilers/gcc/common/builder.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/gcc/common/builder.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix b/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix index 6df4e32ddb76..98525b5e237e 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix @@ -219,6 +219,7 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.la" "''${!outputLib}" moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dylib" "''${!outputLib}" moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll.a" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll" "''${!outputLib}" moveToOutput "share/gcc-*/python" "''${!outputLib}" if [ -z "$enableShared" ]; then @@ -233,6 +234,8 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.so*" "''${!outputLib}" moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.la" "''${!outputLib}" moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dylib" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll.a" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll" "''${!outputLib}" for i in "''${!outputLib}/''${targetConfig}"/lib64/*.{la,py}; do substituteInPlace "$i" --replace "$out" "''${!outputLib}" |