diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-16 08:39:37 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-16 08:39:37 +0100 |
| commit | c643ccaa8c91f78b8c89eb87589886b8906d5b38 (patch) | |
| tree | 22e57f627266ba2940c4bbee62da17846472659a /pkgs/stdenv | |
| parent | 55b6c1792619085dd8aacf46b94e2f33303dd58e (diff) | |
| parent | da972b6cc40b4be7492df1661a522e12bf747807 (diff) | |
| download | nixlib-c643ccaa8c91f78b8c89eb87589886b8906d5b38.tar nixlib-c643ccaa8c91f78b8c89eb87589886b8906d5b38.tar.gz nixlib-c643ccaa8c91f78b8c89eb87589886b8906d5b38.tar.bz2 nixlib-c643ccaa8c91f78b8c89eb87589886b8906d5b38.tar.lz nixlib-c643ccaa8c91f78b8c89eb87589886b8906d5b38.tar.xz nixlib-c643ccaa8c91f78b8c89eb87589886b8906d5b38.tar.zst nixlib-c643ccaa8c91f78b8c89eb87589886b8906d5b38.zip | |
Merge #13950: move ncurses utilities to $out
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 810031809173..16e35d19db0d 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -296,7 +296,7 @@ in rec { allowedRequisites = (with pkgs; [ 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 + gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out binutils-raw.dev binutils gettext ]) ++ (with pkgs.darwin; [ diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index e2ad9c2b8d7e..c3610fdc59de 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -65,7 +65,7 @@ rec { cp -d ${libiconv.lib or libiconv}/lib/lib*.dylib $out/lib cp -d ${gettext}/lib/libintl*.dylib $out/lib chmod +x $out/lib/libintl*.dylib - cp -d ${ncurses.lib}/lib/libncurses*.dylib $out/lib + cp -d ${ncurses.out}/lib/libncurses*.dylib $out/lib # Copy what we need of clang cp -d ${llvmPackages.clang-unwrapped}/bin/clang $out/bin |