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/development/interpreters/guile/default.nix | 2 +- pkgs/development/interpreters/php/default.nix | 2 +- pkgs/development/libraries/slang/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development') 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 ]; -- cgit 1.4.1