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

stdenv-darwin: fix to work with multiple outputs

This commit is contained in:
Dan Peebles 2016-02-13 15:46:42 -05:00
parent 6f2ab634f9
commit 0a23d430bf
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,7 @@ in rec {
allowedRequisites = allowedRequisites =
[ bootstrapTools ] ++ [ bootstrapTools ] ++
(with pkgs; [ xz libcxx libcxxabi icu ]) ++ (with pkgs; [ xz.bin xz.out libcxx libcxxabi icu.out ]) ++
(with pkgs.darwin; [ dyld Libsystem CF locale ]); (with pkgs.darwin; [ dyld Libsystem CF locale ]);
overrides = persistent1; overrides = persistent1;
@ -211,7 +211,7 @@ in rec {
allowedRequisites = allowedRequisites =
[ bootstrapTools ] ++ [ bootstrapTools ] ++
(with pkgs; [ icu bash libcxx libcxxabi ]) ++ (with pkgs; [ xz.bin xz.out icu.out bash libcxx libcxxabi ]) ++
(with pkgs.darwin; [ dyld Libsystem locale ]); (with pkgs.darwin; [ dyld Libsystem locale ]);
overrides = persistent2; overrides = persistent2;
@ -294,9 +294,11 @@ in rec {
}; };
allowedRequisites = (with pkgs; [ allowedRequisites = (with pkgs; [
xz libcxx libcxxabi icu gmp gnumake findutils bzip2 llvm zlib libffi xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out
coreutils ed diffutils gnutar gzip ncurses gnused bash gawk bzip2.bin llvm zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
gnugrep llvmPackages.clang-unwrapped patch pcre binutils-raw binutils gettext gzip ncurses.out ncurses.dev ncurses.lib ncurses.man gnused bash gawk
gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out
binutils-raw.dev binutils gettext
]) ++ (with pkgs.darwin; [ ]) ++ (with pkgs.darwin; [
dyld Libsystem CF cctools libiconv locale dyld Libsystem CF cctools libiconv locale
]); ]);