about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2016-02-01 11:16:50 -0600
committerThomas Tuegel <ttuegel@gmail.com>2016-03-08 11:35:24 -0600
commit3ef7671cea0ed5a4819e1cd83c03f4ee1f85eb96 (patch)
tree4d31f367269d63a1f3c4d1314e50901396f8850c /pkgs/applications
parent394ffcb3e5a89690588319eb995d3e066a1f2f89 (diff)
downloadnixlib-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/applications')
-rw-r--r--pkgs/applications/editors/emacs-24/macport-24.5.nix4
-rw-r--r--pkgs/applications/editors/heme/default.nix2
-rw-r--r--pkgs/applications/science/logic/saw-tools/default.nix2
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index ae0a66b30fee..23133ec262c3 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "LDFLAGS=-L${ncurses.lib}/lib"
+    "LDFLAGS=-L${ncurses.out}/lib"
     "--with-xml2=yes"
     "--with-gnutls=yes"
     "--with-mac"
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   ];
 
   CFLAGS = "-O3";
-  LDFLAGS = "-O3 -L${ncurses.lib}/lib";
+  LDFLAGS = "-O3 -L${ncurses.out}/lib";
 
   postInstall = ''
     mkdir -p $out/share/emacs/site-lisp/
diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix
index 9ced023988cc..c74e47a5243d 100644
--- a/pkgs/applications/editors/heme/default.nix
+++ b/pkgs/applications/editors/heme/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile \
       --replace "/usr/local" "$out" \
       --replace "CFLAGS = " "CFLAGS = -I${ncurses.dev}/include " \
-      --replace "LDFLAGS = " "LDFLAGS = -L${ncurses.lib}/lib " \
+      --replace "LDFLAGS = " "LDFLAGS = -L${ncurses.out}/lib " \
       --replace "-lcurses" "-lncurses"
   '';
   buildInputs = [ ncurses ];
diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix
index 97a06bf093d3..1153c0b3cf5c 100644
--- a/pkgs/applications/science/logic/saw-tools/default.nix
+++ b/pkgs/applications/science/logic/saw-tools/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     mv doc $out/share
 
     # Hack around lack of libtinfo in NixOS
-    ln -s ${ncurses.lib}/lib/libncursesw.so.5       $out/lib/libtinfo.so.5
+    ln -s ${ncurses.out}/lib/libncursesw.so.5       $out/lib/libtinfo.so.5
     ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0
 
     # Add a clang symlink for easy building with a suitable compiler.