Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5c4fa41d2aa1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f385e224e596
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 10, 2017

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

    @Ericson2314
    Ericson2314 committed Jul 10, 2017
    Copy the full SHA
    2f19895 View commit details

  2. stdenv: Stop reversing the list of sandbox stuff 

    We're breaking hashes anyways
    @Ericson2314
    Ericson2314 committed Jul 10, 2017
    Copy the full SHA
    5896d84 View commit details

  3. Merge pull request #27279 from obsidiansystems/stdenv-misc 

    Two misc changes for stdenv
    @edolstra
    edolstra authored Jul 10, 2017
    Copy the full SHA
    f385e22 View commit details
Showing with 7 additions and 10 deletions.
  1. +7 −10 pkgs/stdenv/generic/make-derivation.nix
17 changes: 7 additions & 10 deletions pkgs/stdenv/generic/make-derivation.nix
View file
Original file line number Diff line number Diff line change
@@ -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;

@@ -64,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;