From 6cdbc4de22d34fb28e9bb3110d6ff9702c400f89 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 9 Sep 2019 22:42:03 -0400 Subject: static: disable python on macOS We get an infinite recursion otherwise due to some issue in darwin bootstrapping. Fixes #68393 --- pkgs/top-level/static.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index eac84cfc1a8..bc6c3525f77 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -14,7 +14,7 @@ self: super: let inherit (super.stdenvAdapters) makeStaticBinaries makeStaticLibraries propagateBuildInputs; - inherit (super.lib) foldl optional flip id composeExtensions; + inherit (super.lib) foldl optional flip id composeExtensions optionalAttrs; inherit (super) makeSetupHook; # Best effort static binaries. Will still be linked to libSystem, @@ -72,10 +72,12 @@ in { ncurses = super.ncurses.override { enableStatic = true; }; - libxml2 = super.libxml2.override { + libxml2 = super.libxml2.override ({ enableShared = false; enableStatic = true; - }; + } // optionalAttrs super.stdenv.hostPlatform.isDarwin { + pythonSupport = false; + }); zlib = super.zlib.override { static = true; shared = false; -- cgit 1.4.1