public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: Mass replace 'ncurses}/lib' to refer the 'lib' output

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-01-24 09:30:01 +02:00
parent 04c5830432
commit 8eb5d7d037
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/emacs-24/macport-24.5.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
''; '';
configureFlags = [ configureFlags = [
"LDFLAGS=-L${ncurses}/lib" "LDFLAGS=-L${ncurses.lib}/lib"
"--with-xml2=yes" "--with-xml2=yes"
"--with-gnutls=yes" "--with-gnutls=yes"
"--with-mac" "--with-mac"
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
]; ];
CFLAGS = "-O3"; CFLAGS = "-O3";
LDFLAGS = "-O3 -L${ncurses}/lib"; LDFLAGS = "-O3 -L${ncurses.lib}/lib";
postInstall = '' postInstall = ''
mkdir -p $out/share/emacs/site-lisp/ mkdir -p $out/share/emacs/site-lisp/

2
pkgs/development/compilers/ghc/8.0.1.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-gcc=${stdenv.cc}/bin/cc" "--with-gcc=${stdenv.cc}/bin/cc"
"--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib" "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib"
"--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib" "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses.lib}/lib"
] ++ stdenv.lib.optional stdenv.isDarwin [ ] ++ stdenv.lib.optional stdenv.isDarwin [
"--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
]; ];

2
pkgs/development/mobile/androidenv/androidndk_r8e.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
\( -type f -a -name "*.so*" \) -o \ \( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm -0100 \) \ \( -type f -a -perm -0100 \) \
\) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
--set-rpath ${zlib}/lib:${ncurses}/lib {} \; --set-rpath ${zlib}/lib:${ncurses.lib}/lib {} \;
# fix ineffective PROGDIR / MYNDKDIR determination # fix ineffective PROGDIR / MYNDKDIR determination
for i in ndk-build ndk-gdb ndk-gdb-py for i in ndk-build ndk-gdb ndk-gdb-py
do do

2
pkgs/servers/sql/mariadb/default.nix
View File

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [
"-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1" "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1"
"-DWITHOUT_TOKUDB=1" "-DWITHOUT_TOKUDB=1"
"-DCURSES_LIBRARY=${ncurses}/lib/libncurses.dylib" "-DCURSES_LIBRARY=${ncurses.lib}/lib/libncurses.dylib"
]; ];
# fails to find lex_token.h sometimes # fails to find lex_token.h sometimes

2
pkgs/tools/system/gptfdisk/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile.mac --replace \ substituteInPlace Makefile.mac --replace \
" -I/opt/local/include -I /usr/local/include -I/opt/local/include" "" " -I/opt/local/include -I /usr/local/include -I/opt/local/include" ""
substituteInPlace Makefile.mac --replace \ substituteInPlace Makefile.mac --replace \
"/opt/local/lib/libncurses.a" "${ncurses}/lib/libncurses.dylib" "/opt/local/lib/libncurses.a" "${ncurses.lib}/lib/libncurses.dylib"
''; '';
buildPhase = stdenv.lib.optionalString stdenv.isDarwin "make -f Makefile.mac"; buildPhase = stdenv.lib.optionalString stdenv.isDarwin "make -f Makefile.mac";