diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-07 15:57:01 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-30 22:04:21 -0500 |
commit | 3a50395ef226259694689da92b2fd636476abc67 (patch) | |
tree | 1b63a94e0631d0726bb5556386a1c75f5520df5d /pkgs | |
parent | a036473a0a0c6100fce316e1444fc33ec6674b85 (diff) | |
download | nixlib-3a50395ef226259694689da92b2fd636476abc67.tar nixlib-3a50395ef226259694689da92b2fd636476abc67.tar.gz nixlib-3a50395ef226259694689da92b2fd636476abc67.tar.bz2 nixlib-3a50395ef226259694689da92b2fd636476abc67.tar.lz nixlib-3a50395ef226259694689da92b2fd636476abc67.tar.xz nixlib-3a50395ef226259694689da92b2fd636476abc67.tar.zst nixlib-3a50395ef226259694689da92b2fd636476abc67.zip |
{bintools,cc}-wrapper: extraPackages should be `depsTargetTargetPropagated`
They are libraries used by programs built with these tools, not used by the tools themselves.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 57859b2f371b..bb0e6b82aa5d 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -178,7 +178,7 @@ stdenv.mkDerivation { else throw "unknown emulation for platform: " + targetPlatform.config; in targetPlatform.platform.bfdEmulation or (fmt + "-" + arch); - propagatedBuildInputs = extraPackages; + depsTargetTargetPropagated = extraPackages; setupHook = ./setup-hook.sh; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 218e9f6b957f..5d878d219f18 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -201,7 +201,8 @@ stdenv.mkDerivation { ln -s $ccPath/${targetPrefix}ghdl $out/bin/${targetPrefix}ghdl ''; - propagatedBuildInputs = [ bintools ] ++ extraPackages; + propagatedBuildInputs = [ bintools ]; + depsTargetTargetPropagated = extraPackages; setupHook = ./setup-hook.sh; |