diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 20:41:10 +0300 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:49 +0200 |
commit | 99acb412ab50bb7aaf6060b698e9b9751f13fef6 (patch) | |
tree | edcc7035cffb8b5d3c0d8e854be824f4a2d98d60 /pkgs | |
parent | 3f8b08f5064743ccab3b231757be61c6473a1cd1 (diff) | |
download | nixlib-99acb412ab50bb7aaf6060b698e9b9751f13fef6.tar nixlib-99acb412ab50bb7aaf6060b698e9b9751f13fef6.tar.gz nixlib-99acb412ab50bb7aaf6060b698e9b9751f13fef6.tar.bz2 nixlib-99acb412ab50bb7aaf6060b698e9b9751f13fef6.tar.lz nixlib-99acb412ab50bb7aaf6060b698e9b9751f13fef6.tar.xz nixlib-99acb412ab50bb7aaf6060b698e9b9751f13fef6.tar.zst nixlib-99acb412ab50bb7aaf6060b698e9b9751f13fef6.zip |
treewide: Make explicit that 'dev' output of ncurses is used
Diffstat (limited to 'pkgs')
7 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index 133a15aebf8a..1454760f541b 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { dontDisableStatic = true; - configureFlags = "--with-ncurses=${ncurses}"; + configureFlags = "--with-ncurses=${ncurses.dev}"; preConfigure = stdenv.lib.optionalString enablePlugin '' configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi" diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 1565ce2b3dbd..33fb84160707 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses.out}/lib" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ]; diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index 7ddb78d052e0..a6cdf9eb8605 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; - configureFlags = "--without-x --with-ncurses=${ncurses}"; + configureFlags = "--without-x --with-ncurses=${ncurses.dev}"; postInstall = '' mkdir -p $dev/bin diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 223f19682746..4685787af5f7 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { -"es|\"cscope-indexer\"|\"$out/libexec/cscope/cscope-indexer\"|g"; ''; - configureFlags = "--with-ncurses=${ncurses}"; + configureFlags = "--with-ncurses=${ncurses.dev}"; buildInputs = [ ncurses ]; nativeBuildInputs = [ pkgconfig emacs ]; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index e6b81ca7eb17..73e5def8be1b 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ltdl-include=${libtool}/include" "--with-ltdl-lib=${libtool.lib}/lib" - "--with-ncurses=${ncurses}" + "--with-ncurses=${ncurses.dev}" "--with-sqlite3=${sqlite}" "--with-exuberant-ctags=${ctags}/bin/ctags" "--with-posix-sort=${coreutils}/bin/sort" diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 42adab1c887c..1c9b5879e6ec 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -53,7 +53,7 @@ appleDerivation rec { cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/stdarg.h $out/include for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \ - ${libdispatch} ${ncurses} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \ + ${libdispatch} ${ncurses.dev} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \ ${Libnotify} ${mDNSResponder} ${launchd} ${libutil}; do (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include) done diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index b77b5e831123..bdedb07b900e 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--with-iconv-dir=${libiconv}" "--with-xml=${libxml2}" "--with-openssl=${openssl}" - "--with-libncurses-prefix=${ncurses}" + "--with-libncurses-prefix=${ncurses.dev}" "--with-libcurl=${curl.dev}" "--with-pcre=${pcre}" "--enable-milter" |