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

Merge pull request #39940 from matthewbauer/work

Browse Source 
macOS closure-size reduction
This commit is contained in:
Matthew Justin Bauer 2018-05-06 04:27:02 +00:00 committed by GitHub
commit 5f65ec3f22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/gettext/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
patches = [ ./absolute-paths.diff ]; patches = [ ./absolute-paths.diff ];
outputs = [ "out" "man" "doc" "info" ]; outputs = [ "out" "dev" "man" "doc" "info" ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

1
pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
View File

@ -20,5 +20,6 @@ appleDerivation {
postInstall = '' postInstall = ''
mv $out/usr/local/include $out/include mv $out/usr/local/include $out/include
rm -rf $out/usr
''; '';
} }

5
pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
View File

@ -3,10 +3,13 @@
removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }: removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }:
appleDerivation rec { appleDerivation rec {
phases = [ "unpackPhase" "installPhase" ]; dontBuild = true;
dontConfigure = true;
nativeBuildInputs = [ cpio ]; nativeBuildInputs = [ cpio ];
outputs = [ "out" "dev" ];
installPhase = '' installPhase = ''
export NIX_ENFORCE_PURITY= export NIX_ENFORCE_PURITY=

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

@ -225,7 +225,7 @@ in rec {
allowedRequisites = allowedRequisites =
[ bootstrapTools ] ++ [ bootstrapTools ] ++
(with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++ (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; overrides = persistent;
}; };
@ -263,7 +263,7 @@ in rec {
allowedRequisites = allowedRequisites =
[ bootstrapTools ] ++ [ bootstrapTools ] ++
(with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++ (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; overrides = persistent;
}; };
@ -383,7 +383,7 @@ in rec {
binutils.bintools darwin.binutils darwin.binutils.bintools binutils.bintools darwin.binutils darwin.binutils.bintools
cc.expand-response-params cc.expand-response-params
]) ++ (with pkgs.darwin; [ ]) ++ (with pkgs.darwin; [
dyld Libsystem CF cctools ICU libiconv locale dyld Libsystem Libsystem.dev CF cctools ICU libiconv locale
]); ]);
overrides = self: super: overrides = self: super: