From 8d473f107c8d9f0c43986765304faf75f5e49b5a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 20:46:17 +0300 Subject: treewide: Make explicit that 'dev' output of readline is used --- pkgs/applications/misc/pinfo/default.nix | 2 +- pkgs/applications/science/math/pari/default.nix | 2 +- pkgs/applications/video/xine-ui/default.nix | 2 +- pkgs/development/interpreters/guile/default.nix | 2 +- pkgs/development/interpreters/php/default.nix | 2 +- pkgs/development/libraries/slang/default.nix | 2 +- pkgs/servers/sql/virtuoso/6.x.nix | 2 +- pkgs/servers/sql/virtuoso/7.x.nix | 2 +- pkgs/tools/backup/bareos/default.nix | 2 +- pkgs/tools/text/gawk/default.nix | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index 222dddc0e897..9753e6d44755 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { 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; { description = "A viewer for info files"; diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index f98750e8af28..da10e89855ae 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureScript = "./Configure"; configureFlags = "--with-gmp=${gmp.dev} " + - "--with-readline=${readline}"; + "--with-readline=${readline.dev}"; meta = with stdenv.lib; { description = "Computer algebra system for high-performance number theory computations"; diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index fd7b31de16ed..f8a357345348 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { 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_LIBS="-L ${lirc}/lib -llirc_client"; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 333a022254b6..25fa3d0bc74e 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -100,7 +100,7 @@ "--with-libgmp-prefix=${gmp.dev}" # Same for these (?). - "--with-libreadline-prefix=${readline}" + "--with-libreadline-prefix=${readline.dev}" "--with-libunistring-prefix=${libunistring}" # See below. diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 54f90d7b5952..eccc0d66c2bd 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -85,7 +85,7 @@ let }; readline = { - configureFlags = ["--with-readline=${readline}"]; + configureFlags = ["--with-readline=${readline.dev}"]; buildInputs = [ readline ]; }; diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index c86c196a09d2..2f2b3d3fc061 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sed -i -e "s|/bin/ln|ln|" src/Makefile.in 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 ]; propagatedBuildInputs = [ ncurses ]; diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 0bf960f44f9e..aba8efa0798b 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { CPP = "${stdenv.cc}/bin/gcc -E"; configureFlags = " - --enable-shared --disable-all-vads --with-readline=${readline} + --enable-shared --disable-all-vads --with-readline=${readline.dev} --disable-hslookup --disable-wbxml2 --without-iodbc --enable-openssl=${openssl.dev} "; diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index e35f3589e492..192bdc9dcb1e 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { CPP = "${stdenv.cc}/bin/gcc -E"; configureFlags = " - --enable-shared --disable-all-vads --with-readline=${readline} + --enable-shared --disable-all-vads --with-readline=${readline.dev} --disable-hslookup --disable-wbxml2 --without-iodbc --enable-openssl=${openssl.dev} "; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 0b40fea14d9a..d28c63fdcd8b 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "--enable-dynamic-cats-backends" "--enable-sql-pooling" "--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 (openssl != null) "--with-openssl=${openssl.dev}" ++ optional (sqlite != null) "--with-sqlite3=${sqlite}" diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 8578960b9875..c7e0857c2ca4 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin locale; 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-*"; -- cgit 1.4.1