diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-29 01:17:52 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-10 11:25:51 -0400 |
| commit | 2f198956c7b214d79715f13b57eb1b9069ebb523 (patch) | |
| tree | bb472132507f02c6d8173c20f62d9780766db735 /pkgs/stdenv | |
| parent | 5c4fa41d2aa1c1203a65ce47fbb5e5891ca36876 (diff) | |
| download | nixlib-2f198956c7b214d79715f13b57eb1b9069ebb523.tar nixlib-2f198956c7b214d79715f13b57eb1b9069ebb523.tar.gz nixlib-2f198956c7b214d79715f13b57eb1b9069ebb523.tar.bz2 nixlib-2f198956c7b214d79715f13b57eb1b9069ebb523.tar.lz nixlib-2f198956c7b214d79715f13b57eb1b9069ebb523.tar.xz nixlib-2f198956c7b214d79715f13b57eb1b9069ebb523.tar.zst nixlib-2f198956c7b214d79715f13b57eb1b9069ebb523.zip | |
stdenv: Make separate-debug-info.sh a `nativeBuildInput`
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 31b0428eeb2b..e2f072d81497 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -49,12 +49,10 @@ rec { dependencies' = let 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; - buildInputs = lib.elemAt justMap 1 - # TODO(@Ericson2314): Should instead also be appended to `nativeBuildInputs`. - ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh; - in [ nativeBuildInputs buildInputs ]; + in [ nativeBuildInputs ] ++ lib.tail justMap; propagatedDependencies' = map lib.chooseDevOutputs propagatedDependencies; |