Commit 5896d84d authored by John Ericson's avatar John Ericson
Browse files

stdenv: Stop reversing the list of sandbox stuff 

We're breaking hashes anyways
parent 2f198956

pkgs/stdenv/generic/make-derivation.nix

+4 −5
Original line number Diff line number Diff line
@@ -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;