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

darwin bootstrapping: Dedup code a bit

Browse Source
This commit is contained in:
John Ericson 2020-10-13 19:26:13 -04:00
parent 5235a1e1fc
commit e75f863bd4
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,10 +190,7 @@ in rec {
stage1 = prevStage: let stage1 = prevStage: let
persistent = self: super: with prevStage; { persistent = self: super: with prevStage; {
cmake = super.cmake.override { cmake = super.cmakeMinimal;
isBootstrap = true;
useSharedLibraries = false;
};
python3 = super.python3Minimal; python3 = super.python3Minimal;

4
pkgs/top-level/all-packages.nix
View File

@ -10823,7 +10823,9 @@ in
cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { };
cmakeMinimal = cmake.override { isBootstrap = true; }; cmakeMinimal = libsForQt5.callPackage ../development/tools/build-managers/cmake {
isBootstrap = true;
};
cmakeCurses = cmake.override { useNcurses = true; }; cmakeCurses = cmake.override { useNcurses = true; };