diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-09-17 17:41:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-17 17:41:13 -0400 |
| commit | dae73e6bdeec0fa42f0e86f19911283f1c5cc0b8 (patch) | |
| tree | 4083230480124655f22c59bd92f4f145bd834b54 | |
| parent | 6bbf9dc419c39189520ce5bcc68f2b071e71557d (diff) | |
| parent | 6cdbc4de22d34fb28e9bb3110d6ff9702c400f89 (diff) | |
Merge pull request #68394 from matthewbauer/static-libxml2
static: disable python on macOS
| -rw-r--r-- | pkgs/top-level/static.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index eac84cfc1a8d..bc6c3525f77e 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; |