diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-23 10:04:55 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-23 10:04:55 -0400 |
| commit | 25f4f06c2ea7a70bceb3a934de271ae3bed0675d (patch) | |
| tree | 699ec3203f2bd501b778c711708a3a711877591b /pkgs | |
| parent | c641a74bd6aa88a0906f036fddb37eddd432a525 (diff) | |
| parent | f567a851a15d31be2ce95856b93a9f71adfae601 (diff) | |
| download | nixpkgs-25f4f06c2ea7a70bceb3a934de271ae3bed0675d.tar nixpkgs-25f4f06c2ea7a70bceb3a934de271ae3bed0675d.tar.gz nixpkgs-25f4f06c2ea7a70bceb3a934de271ae3bed0675d.tar.bz2 nixpkgs-25f4f06c2ea7a70bceb3a934de271ae3bed0675d.tar.lz nixpkgs-25f4f06c2ea7a70bceb3a934de271ae3bed0675d.tar.xz nixpkgs-25f4f06c2ea7a70bceb3a934de271ae3bed0675d.tar.zst nixpkgs-25f4f06c2ea7a70bceb3a934de271ae3bed0675d.zip | |
Merge branch 'stdenv-darwin-persist' into ios-mini-staging
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 9563f52ea26..951c96877f9 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -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 @@ -321,7 +321,7 @@ in rec { darwin = super.darwin // { inherit (darwin) dyld ICU Libsystem libiconv; } // lib.optionalAttrs (super.targetPlatform == localSystem) { - inherit (darwin) binutils cctools; + inherit (darwin) binutils binutils-unwrapped cctools; }; } // lib.optionalAttrs (super.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. @@ -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 = [ |