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

wip/yesman
Tuomas Tynkkynen 8 years ago committed by Vladimír Čunát
parent 3f8b08f506
commit 99acb412ab
  1. 2
      pkgs/applications/networking/instant-messengers/silc-client/default.nix
  2. 2
      pkgs/development/compilers/ghc/8.0.1.nix
  3. 2
      pkgs/development/libraries/aalib/default.nix
  4. 2
      pkgs/development/tools/misc/cscope/default.nix
  5. 2
      pkgs/development/tools/misc/global/default.nix
  6. 2
      pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
  7. 2
      pkgs/tools/security/clamav/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"

@ -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"
];

@ -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

@ -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 ];

@ -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"

@ -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

@ -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"

Loading…
Cancel
Save