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/applications | |
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/applications')
-rw-r--r-- | pkgs/applications/editors/emacs-24/macport-24.5.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/editors/heme/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/girara/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/zathura/core/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/logic/saw-tools/default.nix | 2 |
5 files changed, 6 insertions, 6 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/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 6598c13253bb..cfa38a118614 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk gettext ]; makeFlags = [ "PREFIX=$(out)" ] - ++ optional withBuildColors "TPUT=${ncurses.dev}/bin/tput" + ++ optional withBuildColors "TPUT=${ncurses.out}/bin/tput" ++ optional (!withBuildColors) "TPUT_AVAILABLE=0" ; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index f09c971351f3..62e7ee60cb3e 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" - "TPUT=${ncurses.dev}/bin/tput" + "TPUT=${ncurses.out}/bin/tput" ]; postInstall = '' 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. |