From 3ef7671cea0ed5a4819e1cd83c03f4ee1f85eb96 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 1 Feb 2016 11:16:50 -0600 Subject: ncurses: combine $lib and $out outputs The $lib output refers to the terminfo database in $out, which is about 10x larger than the ncurses shared library. Splitting these outputs saves a small amount of space for any derivations that use the terminfo database but not the ncurses library, but we do not have evidence that any such exist. --- pkgs/stdenv/darwin/default.nix | 2 +- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/stdenv') 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 dc52015c52dc..32b779689deb 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}/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 -- cgit 1.4.1