diff options
| author | Dan Peebles <pumpkin@me.com> | 2016-02-13 15:46:42 -0500 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2016-02-13 15:48:22 -0500 |
| commit | 0a23d430bf68c1028bd8827a46b0786ba17b10eb (patch) | |
| tree | 50794b3a042f83e6663e1954ef29ef4b5c99e68f /pkgs/stdenv | |
| parent | 6f2ab634f9f76365d7af195a3c8b14d81a070ff7 (diff) | |
| download | nixlib-0a23d430bf68c1028bd8827a46b0786ba17b10eb.tar nixlib-0a23d430bf68c1028bd8827a46b0786ba17b10eb.tar.gz nixlib-0a23d430bf68c1028bd8827a46b0786ba17b10eb.tar.bz2 nixlib-0a23d430bf68c1028bd8827a46b0786ba17b10eb.tar.lz nixlib-0a23d430bf68c1028bd8827a46b0786ba17b10eb.tar.xz nixlib-0a23d430bf68c1028bd8827a46b0786ba17b10eb.tar.zst nixlib-0a23d430bf68c1028bd8827a46b0786ba17b10eb.zip | |
stdenv-darwin: fix to work with multiple outputs
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 0af7071e2186..810031809173 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -176,7 +176,7 @@ in rec { allowedRequisites = [ bootstrapTools ] ++ - (with pkgs; [ xz libcxx libcxxabi icu ]) ++ + (with pkgs; [ xz.bin xz.out libcxx libcxxabi icu.out ]) ++ (with pkgs.darwin; [ dyld Libsystem CF locale ]); overrides = persistent1; @@ -211,7 +211,7 @@ in rec { allowedRequisites = [ bootstrapTools ] ++ - (with pkgs; [ icu bash libcxx libcxxabi ]) ++ + (with pkgs; [ xz.bin xz.out icu.out bash libcxx libcxxabi ]) ++ (with pkgs.darwin; [ dyld Libsystem locale ]); overrides = persistent2; @@ -294,9 +294,11 @@ in rec { }; allowedRequisites = (with pkgs; [ - xz libcxx libcxxabi icu gmp gnumake findutils bzip2 llvm zlib libffi - coreutils ed diffutils gnutar gzip ncurses gnused bash gawk - gnugrep llvmPackages.clang-unwrapped patch pcre binutils-raw binutils gettext + xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out + bzip2.bin llvm zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar + 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; [ dyld Libsystem CF cctools libiconv locale ]); |