diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-06 04:27:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-06 04:27:02 +0000 |
| commit | 5f65ec3f22877fb1c808025e75c915293e91e763 (patch) | |
| tree | 833c6e3dab9f7c3ae6255b02d0dcf832c605193f | |
| parent | ea9656e3477a5f777f282d4e80c3fcb8047535d0 (diff) | |
| parent | 5206574be32cbcfa8464dbf83db7d93dee784b5c (diff) | |
| download | nixpkgs-5f65ec3f22877fb1c808025e75c915293e91e763.tar nixpkgs-5f65ec3f22877fb1c808025e75c915293e91e763.tar.gz nixpkgs-5f65ec3f22877fb1c808025e75c915293e91e763.tar.bz2 nixpkgs-5f65ec3f22877fb1c808025e75c915293e91e763.tar.lz nixpkgs-5f65ec3f22877fb1c808025e75c915293e91e763.tar.xz nixpkgs-5f65ec3f22877fb1c808025e75c915293e91e763.tar.zst nixpkgs-5f65ec3f22877fb1c808025e75c915293e91e763.zip | |
Merge pull request #39940 from matthewbauer/work
macOS closure-size reduction
4 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 6dec7747c7e..e64c045ad81 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patches = [ ./absolute-paths.diff ]; - outputs = [ "out" "man" "doc" "info" ]; + outputs = [ "out" "dev" "man" "doc" "info" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix index eef26f4b79a..6cf7ee07b70 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix @@ -20,5 +20,6 @@ appleDerivation { postInstall = '' mv $out/usr/local/include $out/include + rm -rf $out/usr ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 28406c9751d..8575e067625 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -3,10 +3,13 @@ removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }: appleDerivation rec { - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; + dontConfigure = true; nativeBuildInputs = [ cpio ]; + outputs = [ "out" "dev" ]; + installPhase = '' export NIX_ENFORCE_PURITY= diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 9563f52ea26..98102cd5654 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -225,7 +225,7 @@ in rec { allowedRequisites = [ bootstrapTools ] ++ (with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++ - (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]); + (with pkgs.darwin; [ dyld Libsystem Libsystem.dev CF ICU locale ]); overrides = persistent; }; @@ -263,7 +263,7 @@ in rec { allowedRequisites = [ bootstrapTools ] ++ (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++ - (with pkgs.darwin; [ dyld ICU Libsystem locale ]); + (with pkgs.darwin; [ dyld ICU Libsystem Libsystem.dev locale ]); overrides = persistent; }; @@ -383,7 +383,7 @@ in rec { binutils.bintools darwin.binutils darwin.binutils.bintools cc.expand-response-params ]) ++ (with pkgs.darwin; [ - dyld Libsystem CF cctools ICU libiconv locale + dyld Libsystem Libsystem.dev CF cctools ICU libiconv locale ]); overrides = self: super: |