aboutsummaryrefslogtreecommitdiff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-10-25 09:38:02 +0100
committerVladimír Čunát <v@cunat.cz>2020-10-25 09:41:51 +0100
commitc778945806b44d46ec16bc4302e7e7163e6bab97 (patch)
tree8c9c088a40cc1619fe6a27e32d295df45c9e9ebc /pkgs/stdenv
parent38f85a5bba7038f31a352b09ff7bc68fcbad2633 (diff)
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits. This reverts commit 17f5305b6c20df795c365368d2d868266519599e, reversing changes made to a8a018ddc0a8b5c3d4fa94c94b672c37356bc075.
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/darwin/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 58da8b71b650..a040e6ab2424 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -190,7 +190,10 @@ in rec {
stage1 = prevStage: let
persistent = self: super: with prevStage; {
- cmake = super.cmakeMinimal;
+ cmake = super.cmake.override {
+ isBootstrap = true;
+ useSharedLibraries = false;
+ };
python3 = super.python3Minimal;