diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-02-01 11:16:50 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-03-08 11:35:24 -0600 |
commit | 3ef7671cea0ed5a4819e1cd83c03f4ee1f85eb96 (patch) | |
tree | 4d31f367269d63a1f3c4d1314e50901396f8850c /pkgs/development/libraries | |
parent | 394ffcb3e5a89690588319eb995d3e066a1f2f89 (diff) | |
download | nixlib-3ef7671cea0ed5a4819e1cd83c03f4ee1f85eb96.tar nixlib-3ef7671cea0ed5a4819e1cd83c03f4ee1f85eb96.tar.gz nixlib-3ef7671cea0ed5a4819e1cd83c03f4ee1f85eb96.tar.bz2 nixlib-3ef7671cea0ed5a4819e1cd83c03f4ee1f85eb96.tar.lz nixlib-3ef7671cea0ed5a4819e1cd83c03f4ee1f85eb96.tar.xz nixlib-3ef7671cea0ed5a4819e1cd83c03f4ee1f85eb96.tar.zst nixlib-3ef7671cea0ed5a4819e1cd83c03f4ee1f85eb96.zip |
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.
Diffstat (limited to 'pkgs/development/libraries')
4 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index fb8edd27bf8b..7ddb78d052e0 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { postInstall = '' mkdir -p $dev/bin mv $bin/bin/aalib-config $dev/bin/aalib-config - substituteInPlace $out/lib/libaa.la --replace "${ncurses.dev}/lib" "${ncurses.lib}/lib" + substituteInPlace $out/lib/libaa.la --replace "${ncurses.dev}/lib" "${ncurses.out}/lib" ''; meta = { diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 44e52b99d71b..191c1f6b0f2c 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/lib/gstreamer-0.10/libgstaasink.la \ - --replace "${ncurses.dev}/lib" "${ncurses.lib}/lib" + --replace "${ncurses.dev}/lib" "${ncurses.out}/lib" ''; meta = { diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index abd04849beb1..7868c2cfd140 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { postInstall = '' find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \ - -e 's,-lncurses[a-z]*,-L${ncurses.lib}/lib -lncursesw,g' + -e 's,-lncurses[a-z]*,-L${ncurses.out}/lib -lncursesw,g' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 41d609db4785..ed582fd3ed13 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # gcc-5.patch should be removed after 5.9 patches = [ ./clang.patch ./gcc-5.patch ]; - outputs = [ "dev" "lib" "out" "man" ]; + outputs = [ "dev" "out" "man" ]; setOutputFlags = false; # some aren't supported configureFlags = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { export PKG_CONFIG_LIBDIR="$dev/lib/pkgconfig" mkdir -p "$PKG_CONFIG_LIBDIR" configureFlagsArray+=( - "--libdir=$lib/lib" + "--libdir=$out/lib" "--includedir=$dev/include" "--bindir=$dev/bin" "--mandir=$man/share/man" @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { for library in $libs; do for dylibtype in so dll dylib; do - if [ -e "$lib/lib/lib''${library}$suffix.$dylibtype" ]; then - ln -svf lib''${library}$suffix.$dylibtype $lib/lib/lib$library$newsuffix.$dylibtype - ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $lib/lib/lib$library$newsuffix.$dylibtype.${abiVersion} + if [ -e "$out/lib/lib''${library}$suffix.$dylibtype" ]; then + ln -svf lib''${library}$suffix.$dylibtype $out/lib/lib$library$newsuffix.$dylibtype + ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/lib$library$newsuffix.$dylibtype.${abiVersion} fi done for statictype in a dll.a la; do - if [ -e "$lib/lib/lib''${library}$suffix.$statictype" ]; then - ln -svf lib''${library}$suffix.$statictype $lib/lib/lib$library$newsuffix.$statictype + if [ -e "$out/lib/lib''${library}$suffix.$statictype" ]; then + ln -svf lib''${library}$suffix.$statictype $out/lib/lib$library$newsuffix.$statictype fi done ln -svf ''${library}$suffix.pc $dev/lib/pkgconfig/$library$newsuffix.pc @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - rm "$lib"/lib/*.a + rm "$out"/lib/*.a ''; meta = { |