diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-29 01:19:20 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-10 11:25:51 -0400 |
| commit | 5896d84dbbcff1b1e589e274e3addb6a0f1d2e4d (patch) | |
| tree | b6c22f32929ce800ae352d4a777166c73a1c64e0 /pkgs/stdenv/generic | |
| parent | 2f198956c7b214d79715f13b57eb1b9069ebb523 (diff) | |
| download | nixlib-5896d84dbbcff1b1e589e274e3addb6a0f1d2e4d.tar nixlib-5896d84dbbcff1b1e589e274e3addb6a0f1d2e4d.tar.gz nixlib-5896d84dbbcff1b1e589e274e3addb6a0f1d2e4d.tar.bz2 nixlib-5896d84dbbcff1b1e589e274e3addb6a0f1d2e4d.tar.lz nixlib-5896d84dbbcff1b1e589e274e3addb6a0f1d2e4d.tar.xz nixlib-5896d84dbbcff1b1e589e274e3addb6a0f1d2e4d.tar.zst nixlib-5896d84dbbcff1b1e589e274e3addb6a0f1d2e4d.zip | |
stdenv: Stop reversing the list of sandbox stuff
We're breaking hashes anyways
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index e2f072d81497..05221e2f3c10 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -62,15 +62,14 @@ rec { "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]) // (let - # TODO(@Ericson2314): Reversing of dep lists is just temporary to avoid Darwin mass rebuild. computedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies')); + lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies'); computedPropagatedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists (lib.reverseList propagatedDependencies')); + lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists propagatedDependencies'); computedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies'))); + lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies')); computedPropagatedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists (lib.reverseList propagatedDependencies'))); + lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists propagatedDependencies')); in { builder = attrs.realBuilder or stdenv.shell; |