public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv: Make separate-debug-info.sh a nativeBuildInput

Browse Source
This commit is contained in:
John Ericson 2017-06-29 01:17:52 -04:00
parent 5c4fa41d2a
commit 2f198956c7
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/stdenv/generic/make-derivation.nix
View File

@ -49,12 +49,10 @@ rec {
dependencies' = let dependencies' = let
justMap = map lib.chooseDevOutputs dependencies; justMap = map lib.chooseDevOutputs dependencies;
nativeBuildInputs = lib.elemAt justMap 0 nativeBuildInputs = lib.head justMap
++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh
++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh; ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh;
buildInputs = lib.elemAt justMap 1 in [ nativeBuildInputs ] ++ lib.tail justMap;
# TODO(@Ericson2314): Should instead also be appended to `nativeBuildInputs`.
++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh;
in [ nativeBuildInputs buildInputs ];
propagatedDependencies' = map lib.chooseDevOutputs propagatedDependencies; propagatedDependencies' = map lib.chooseDevOutputs propagatedDependencies;