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

Merge pull request #40992 from obsidiansystems/stdenv-darwin-persist

Browse Source 
darwin stdenv: Properly compose overrides
This commit is contained in:
John Ericson 2018-05-23 10:56:11 -04:00 committed by GitHub
commit aac8be76f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/stdenv/darwin/default.nix
View File

@ -294,7 +294,7 @@ in rec {
extraPreHook = ''
export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
'';
overrides = self: super: (persistent self super) // {
overrides = lib.composeExtensions persistent (self: super: {
# Hack to make sure we don't link ncurses in bootstrap tools. The proper
# solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib,
# quite a sledgehammer just to get the C runtime.
@ -303,7 +303,7 @@ in rec {
"--disable-curses"
];
});
};
});
};
stdenvDarwin = prevStage: let
@ -386,16 +386,15 @@ in rec {
dyld Libsystem CF cctools ICU libiconv locale
]);
overrides = self: super:
let persistent' = persistent self super; in persistent' // {
clang = cc;
llvmPackages = persistent'.llvmPackages // { clang = cc; };
inherit cc;
overrides = lib.composeExtensions persistent (self: super: {
clang = cc;
llvmPackages = super.llvmPackages // { clang = cc; };
inherit cc;
darwin = super.darwin // {
xnu = super.darwin.xnu.override { python = super.python.override { configd = null; }; };
};
darwin = super.darwin // {
xnu = super.darwin.xnu.override { python = super.python.override { configd = null; }; };
};
});
};
stagesDarwin = [