From 16cc4ac83bb3f72c9727d07ee29e979172fa8f71 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 19:40:54 +0300 Subject: treewide: Make explicit that 'dev' output of apacheHttpd is used --- pkgs/applications/version-management/subversion/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/version-management/subversion') diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index fc87aea08a4..dec3046464d 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -39,7 +39,7 @@ let configureFlags = '' ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} - ${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"} + ${if httpServer then "--with-apxs=${apacheHttpd.dev}/bin/apxs" else "--without-apxs"} ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} --disable-keychain -- cgit 1.4.1 From e80e4ba2bbc5fd6e491e47ad7264eead075dd2d7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 20:47:23 +0300 Subject: treewide: Make explicit that 'dev' output of sqlite is used --- pkgs/applications/version-management/subversion/default.nix | 2 +- pkgs/development/interpreters/php/default.nix | 2 +- pkgs/development/libraries/kerberos/heimdal.nix | 2 +- pkgs/development/perl-modules/DBD-SQLite/default.nix | 2 +- pkgs/development/tools/misc/global/default.nix | 2 +- pkgs/games/crawl/crawl_purify.patch | 2 +- pkgs/games/crawl/default.nix | 2 +- pkgs/servers/xmpp/ejabberd/default.nix | 2 +- pkgs/tools/backup/bacula/default.nix | 2 +- pkgs/tools/backup/bareos/default.nix | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'pkgs/applications/version-management/subversion') diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index dec3046464d..d3573b6c962 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -46,7 +46,7 @@ let ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"} ${if httpSupport then "--with-serf=${serf}" else "--without-serf"} --with-zlib=${zlib} - --with-sqlite=${sqlite} + --with-sqlite=${sqlite.dev} ''; preBuild = '' diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index eccc0d66c2b..18ffbe8c9a3 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -90,7 +90,7 @@ let }; sqlite = { - configureFlags = ["--with-pdo-sqlite=${sqlite}"]; + configureFlags = ["--with-pdo-sqlite=${sqlite.dev}"]; buildInputs = [ sqlite ]; }; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 4f73fed34df..3740cf18b1e 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--enable-hdb-openldap-module" - "--with-sqlite3=${sqlite}" + "--with-sqlite3=${sqlite.dev}" "--with-libedit=${libedit}" "--with-openssl=${openssl.dev}" "--without-x" diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index 13b633f4704..897e82c68e1 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -10,7 +10,7 @@ buildPerlPackage rec { propagatedBuildInputs = [ DBI ]; - makeMakerFlags = "SQLITE_LOCATION=${sqlite}"; + makeMakerFlags = "SQLITE_LOCATION=${sqlite.dev}"; patches = [ # Support building against our own sqlite. diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 73e5def8be1..3d09bc92cd3 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "--with-ltdl-include=${libtool}/include" "--with-ltdl-lib=${libtool.lib}/lib" "--with-ncurses=${ncurses.dev}" - "--with-sqlite3=${sqlite}" + "--with-sqlite3=${sqlite.dev}" "--with-exuberant-ctags=${ctags}/bin/ctags" "--with-posix-sort=${coreutils}/bin/sort" ]; diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch index 0e2d335adac..bae82bebfb7 100644 --- a/pkgs/games/crawl/crawl_purify.patch +++ b/pkgs/games/crawl/crawl_purify.patch @@ -7,7 +7,7 @@ index b7e2fbf..5ff23db 100644 ifndef CROSSHOST - SQLITE_INCLUDE_DIR := /usr/include -+ SQLITE_INCLUDE_DIR := ${sqlite}/include ++ SQLITE_INCLUDE_DIR := ${sqlite.dev}/include else # This is totally wrong, works only with some old-style setups, and # on some architectures of Debian/new FHS multiarch -- excluding, for diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 0b9287faf37..26603e377f0 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++" - "SAVEDIR=~/.crawl" "sqlite=${sqlite}" ] + "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" ] ++ stdenv.lib.optionals tileMode [ "TILES=y" "dejavu_fonts=${dejavu_fonts}" ]; postInstall = if tileMode then "mv $out/bin/crawl $out/bin/crawl-tiles" else ""; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 974a636e559..ef7d64b3e78 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { (lib.enableFeature withIconv "iconv") (lib.enableFeature withTools "tools") (lib.enableFeature withRedis "redis") - ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite}"; + ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite.dev}"; enableParallelBuilding = true; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 0b29ca1f42a..fe50468c936 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (!stdenv.isDarwin) acl; configureFlags = [ - "--with-sqlite3=${sqlite}" + "--with-sqlite3=${sqlite.dev}" "--with-postgresql=${postgresql}" ]; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index d28c63fdcd8..8ac9bbef847 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ] ++ 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}" + ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}" ++ optional (libmysql != null) "--with-mysql=${libmysql}" ++ optional (zlib != null) "--with-zlib=${zlib}" -- cgit 1.4.1 From 7fb29bfa73ad7e475201bcaba6e6aacc99e44c2f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 20:50:01 +0300 Subject: treewide: Make explicit that 'dev' output of zlib is used --- pkgs/applications/version-management/subversion/default.nix | 2 +- pkgs/development/compilers/aliceml/default.nix | 2 +- pkgs/development/interpreters/php/default.nix | 2 +- pkgs/development/interpreters/pixie/default.nix | 2 +- pkgs/development/libraries/gdal/default.nix | 2 +- pkgs/development/libraries/gdal/gdal-1_11.nix | 2 +- pkgs/development/libraries/serf/default.nix | 2 +- pkgs/development/libraries/slang/default.nix | 2 +- pkgs/development/ocaml-modules/camlzip/default.nix | 2 +- pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix | 2 +- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- pkgs/games/naev/default.nix | 2 +- pkgs/games/warmux/default.nix | 2 +- pkgs/misc/ghostscript/default.nix | 2 +- pkgs/servers/http/apache-httpd/2.2.nix | 2 +- pkgs/servers/http/apache-httpd/2.4.nix | 2 +- pkgs/tools/backup/bareos/default.nix | 2 +- pkgs/tools/security/clamav/default.nix | 2 +- pkgs/top-level/php-packages.nix | 6 +++--- 19 files changed, 21 insertions(+), 21 deletions(-) (limited to 'pkgs/applications/version-management/subversion') diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index d3573b6c962..c9a7a1a56d4 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -45,7 +45,7 @@ let --disable-keychain ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"} ${if httpSupport then "--with-serf=${serf}" else "--without-serf"} - --with-zlib=${zlib} + --with-zlib=${zlib.dev} --with-sqlite=${sqlite.dev} ''; diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 2a59765b0f3..01a8a337fc0 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { ''; buildPhase = '' - gmp="${gmp.dev}" zlib="${zlib}" PATH=$PATH:`pwd`/seam-support/install/bin make -C make all PREFIX="$out" + gmp="${gmp.dev}" zlib="${zlib.dev}" PATH=$PATH:`pwd`/seam-support/install/bin make -C make all PREFIX="$out" ''; meta = { diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 18ffbe8c9a3..7cee753d4d1 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -69,7 +69,7 @@ let }; zlib = { - configureFlags = ["--with-zlib=${zlib}"]; + configureFlags = ["--with-zlib=${zlib.dev}"]; buildInputs = [zlib]; }; diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index c9b6731ae34..e7d8bf1bc05 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -47,7 +47,7 @@ let patchPhase = '' (cd pixie-src patch -p1 < ${./load_paths.patch} - libraryPaths='["${libuv}" "${libedit}" "${libffi.dev}" "${boost.dev}" "${boost.out}" "${zlib}"]' + libraryPaths='["${libuv}" "${libedit}" "${libffi.dev}" "${boost.dev}" "${boost.out}" "${zlib.dev}"]' export libraryPaths substituteAllInPlace ./pixie/ffi-infer.pxi) ''; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 40c8178834e..36019bdd7f7 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -32,7 +32,7 @@ composableDerivation.composableDerivation {} (fixed: rec { "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) "--with-libpng=${libpng.dev}" # optional - "--with-libz=${zlib}" # optional + "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" "--with-mysql=${mysql.lib}/bin/mysql_config" diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index fec52be924d..06f8afba334 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -27,7 +27,7 @@ composableDerivation.composableDerivation {} (fixed: rec { "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) "--with-libpng=${libpng.dev}" # optional - "--with-libz=${zlib}" # optional + "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" "--with-mysql=${mysql.lib}/bin/mysql_config" diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 47e61ddf2f6..86212eaeb47 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - scons PREFIX="$out" OPENSSL="${openssl.dev}" ZLIB="${zlib}" APR="$(echo "${apr.dev}"/bin/*-config)" \ + scons PREFIX="$out" OPENSSL="${openssl.dev}" ZLIB="${zlib.dev}" APR="$(echo "${apr.dev}"/bin/*-config)" \ APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${ if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc" }" ${ diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index 2f2b3d3fc06..df2b5db89a7 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.dev}"; + configureFlags = "--with-png=${libpng.dev} --with-z=${zlib.dev} --with-pcre=${pcre.dev} --with-readline=${readline.dev}"; buildInputs = [ pcre libpng zlib readline ]; propagatedBuildInputs = [ ncurses ]; diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index d392b5f789c..9025d94b8d5 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { substitute ${./META} META --subst-var-by VERSION "${version}" substituteInPlace Makefile \ --subst-var-by ZLIB_LIBDIR "${zlib.out}/lib" \ - --subst-var-by ZLIB_INCLUDE "${zlib}/include" + --subst-var-by ZLIB_INCLUDE "${zlib.dev}/include" ''; buildFlags = "all allopt"; diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 9314481cbcf..7f2f8e9e4e5 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -11,7 +11,7 @@ buildPerlPackage rec { preConfigure = '' cat > config.in <