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

treewide: Make explicit that 'dev' output of readline is used

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:46:17 +03:00 committed by Vladimír Čunát
parent e0de3b1dc5
commit 8d473f107c
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/pinfo/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [ autoreconfHook gettext texinfo ncurses readline ]; buildInputs = [ autoreconfHook gettext texinfo ncurses readline ];
configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline}" ]; configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline.dev}" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A viewer for info files"; description = "A viewer for info files";

2
pkgs/applications/science/math/pari/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
configureScript = "./Configure"; configureScript = "./Configure";
configureFlags = configureFlags =
"--with-gmp=${gmp.dev} " + "--with-gmp=${gmp.dev} " +
"--with-readline=${readline}"; "--with-readline=${readline.dev}";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Computer algebra system for high-performance number theory computations"; description = "Computer algebra system for high-performance number theory computations";

2
pkgs/applications/video/xine-ui/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c''; patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c'';
configureFlags = "--with-readline=${readline}"; configureFlags = "--with-readline=${readline.dev}";
LIRC_CFLAGS="-I${lirc}/include"; LIRC_CFLAGS="-I${lirc}/include";
LIRC_LIBS="-L ${lirc}/lib -llirc_client"; LIRC_LIBS="-L ${lirc}/lib -llirc_client";

2
pkgs/development/interpreters/guile/default.nix
View File

@ -100,7 +100,7 @@
"--with-libgmp-prefix=${gmp.dev}" "--with-libgmp-prefix=${gmp.dev}"
# Same for these (?). # Same for these (?).
"--with-libreadline-prefix=${readline}" "--with-libreadline-prefix=${readline.dev}"
"--with-libunistring-prefix=${libunistring}" "--with-libunistring-prefix=${libunistring}"
# See below. # See below.

2
pkgs/development/interpreters/php/default.nix
View File

@ -85,7 +85,7 @@ let
}; };
readline = { readline = {
configureFlags = ["--with-readline=${readline}"]; configureFlags = ["--with-readline=${readline.dev}"];
buildInputs = [ readline ]; buildInputs = [ readline ];
}; };

2
pkgs/development/libraries/slang/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sed -i -e "s|/bin/ln|ln|" src/Makefile.in sed -i -e "s|/bin/ln|ln|" src/Makefile.in
sed -i -e "s|-ltermcap|-lncurses|" ./configure sed -i -e "s|-ltermcap|-lncurses|" ./configure
''; '';
configureFlags = "--with-png=${libpng.dev} --with-z=${zlib} --with-pcre=${pcre.dev} --with-readline=${readline}"; configureFlags = "--with-png=${libpng.dev} --with-z=${zlib} --with-pcre=${pcre.dev} --with-readline=${readline.dev}";
buildInputs = [ pcre libpng zlib readline ]; buildInputs = [ pcre libpng zlib readline ];
propagatedBuildInputs = [ ncurses ]; propagatedBuildInputs = [ ncurses ];

2
pkgs/servers/sql/virtuoso/6.x.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
CPP = "${stdenv.cc}/bin/gcc -E"; CPP = "${stdenv.cc}/bin/gcc -E";
configureFlags = " configureFlags = "
--enable-shared --disable-all-vads --with-readline=${readline} --enable-shared --disable-all-vads --with-readline=${readline.dev}
--disable-hslookup --disable-wbxml2 --without-iodbc --disable-hslookup --disable-wbxml2 --without-iodbc
--enable-openssl=${openssl.dev} --enable-openssl=${openssl.dev}
"; ";

2
pkgs/servers/sql/virtuoso/7.x.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
CPP = "${stdenv.cc}/bin/gcc -E"; CPP = "${stdenv.cc}/bin/gcc -E";
configureFlags = " configureFlags = "
--enable-shared --disable-all-vads --with-readline=${readline} --enable-shared --disable-all-vads --with-readline=${readline.dev}
--disable-hslookup --disable-wbxml2 --without-iodbc --disable-hslookup --disable-wbxml2 --without-iodbc
--enable-openssl=${openssl.dev} --enable-openssl=${openssl.dev}
"; ";

2
pkgs/tools/backup/bareos/default.nix
View File

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
"--enable-dynamic-cats-backends" "--enable-dynamic-cats-backends"
"--enable-sql-pooling" "--enable-sql-pooling"
"--enable-scsi-crypto" "--enable-scsi-crypto"
] ++ optionals (readline != null) [ "--disable-conio" "--enable-readline" "--with-readline=${readline}" ] ] ++ optionals (readline != null) [ "--disable-conio" "--enable-readline" "--with-readline=${readline.dev}" ]
++ optional (python != null) "--with-python=${python}" ++ optional (python != null) "--with-python=${python}"
++ optional (openssl != null) "--with-openssl=${openssl.dev}" ++ optional (openssl != null) "--with-openssl=${openssl.dev}"
++ optional (sqlite != null) "--with-sqlite3=${sqlite}" ++ optional (sqlite != null) "--with-sqlite3=${sqlite}"

2
pkgs/tools/text/gawk/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isDarwin locale; ++ stdenv.lib.optional stdenv.isDarwin locale;
configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}" configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}"
++ [(if interactive then "--with-readline=${readline}" else "--without-readline")]; ++ [(if interactive then "--with-readline=${readline.dev}" else "--without-readline")];
postInstall = "rm $out/bin/gawk-*"; postInstall = "rm $out/bin/gawk-*";