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

darwin-stdenv: use darwin.ICU instread of icu

Browse Source
This commit is contained in:
Daiderd Jordan 2017-05-24 01:36:50 +02:00
parent 815f25f31b
commit 077840e528
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,14 +165,14 @@ in rec {
persistent1 = prevStage: self: super: with prevStage; { persistent1 = prevStage: self: super: with prevStage; {
inherit inherit
zlib patchutils m4 scons flex perl bison unifdef unzip openssl icu python zlib patchutils m4 scons flex perl bison unifdef unzip openssl python
libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz
findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils; findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils;
darwin = super.darwin // { darwin = super.darwin // {
inherit (darwin) inherit (darwin)
dyld Libsystem xnu configd libdispatch libclosure launchd; dyld Libsystem xnu configd ICU libdispatch libclosure launchd;
}; };
}; };
@ -185,8 +185,8 @@ in rec {
allowedRequisites = allowedRequisites =
[ bootstrapTools ] ++ [ bootstrapTools ] ++
(with pkgs; [ xz.bin xz.out libcxx libcxxabi icu.out ]) ++ (with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++
(with pkgs.darwin; [ dyld Libsystem CF locale ]); (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
overrides = persistent1 prevStage; overrides = persistent1 prevStage;
}; };
@ -221,8 +221,8 @@ in rec {
allowedRequisites = allowedRequisites =
[ bootstrapTools ] ++ [ bootstrapTools ] ++
(with pkgs; [ xz.bin xz.out icu.out bash libcxx libcxxabi ]) ++ (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++
(with pkgs.darwin; [ dyld Libsystem locale ]); (with pkgs.darwin; [ dyld ICU Libsystem locale ]);
overrides = persistent2 prevStage; overrides = persistent2 prevStage;
}; };
@ -256,7 +256,7 @@ in rec {
persistent4 = prevStage: self: super: with prevStage; { persistent4 = prevStage: self: super: with prevStage; {
inherit inherit
gnumake gzip gnused bzip2 gawk ed xz patch bash gnumake gzip gnused bzip2 gawk ed xz patch bash
libcxxabi libcxx ncurses libffi zlib icu llvm gmp pcre gnugrep libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep
coreutils findutils diffutils patchutils; coreutils findutils diffutils patchutils;
llvmPackages = super.llvmPackages // { llvmPackages = super.llvmPackages // {
@ -264,7 +264,7 @@ in rec {
}; };
darwin = super.darwin // { darwin = super.darwin // {
inherit (darwin) dyld Libsystem cctools libiconv; inherit (darwin) dyld ICU Libsystem cctools libiconv;
}; };
} // lib.optionalAttrs (super.targetPlatform == localSystem) { } // lib.optionalAttrs (super.targetPlatform == localSystem) {
# Need to get rid of these when cross-compiling. # Need to get rid of these when cross-compiling.
@ -310,13 +310,13 @@ in rec {
}; };
allowedRequisites = (with pkgs; [ allowedRequisites = (with pkgs; [
xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out xz.out xz.bin libcxx libcxxabi gmp.out gnumake findutils bzip2.out
bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out
binutils-raw.dev binutils gettext binutils-raw.dev binutils gettext
]) ++ (with pkgs.darwin; [ ]) ++ (with pkgs.darwin; [
dyld Libsystem CF cctools libiconv locale dyld Libsystem CF cctools ICU libiconv locale
]); ]);
overrides = self: super: overrides = self: super: