From c22f86a853a5045b9d4b6cd79425d968de24b999 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 19:46:12 +0300 Subject: treewide: Make explicit that 'dev' output of bzip2 is used --- pkgs/development/interpreters/php/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/interpreters/php') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 5856604c53da..7466abeaf827 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -187,7 +187,7 @@ let }; bz2 = { - configureFlags = ["--with-bz2=${bzip2}"]; + configureFlags = ["--with-bz2=${bzip2.dev}"]; buildInputs = [bzip2]; }; -- cgit 1.4.1 From e28e010b36e565a4ac9ea90cc96290023ddd7696 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 19:47:59 +0300 Subject: treewide: Make explicit that 'dev' output of curl is used --- lib/composable-derivation.nix | 2 +- pkgs/development/interpreters/php/default.nix | 2 +- pkgs/development/tools/vagrant/default.nix | 2 +- pkgs/tools/security/clamav/default.nix | 2 +- pkgs/tools/security/modsecurity/default.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/development/interpreters/php') diff --git a/lib/composable-derivation.nix b/lib/composable-derivation.nix index 8e8faae39824..e3e017d982d3 100644 --- a/lib/composable-derivation.nix +++ b/lib/composable-derivation.nix @@ -50,7 +50,7 @@ let inherit (lib) nv nvs; in # nice features: # declaring "optional featuers" is modular. For instance: # flags.curl = { - # configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"]; + # configureFlags = ["--with-curl=${curl.dev}" "--with-curlwrappers"]; # buildInputs = [curl openssl]; # }; # flags.other = { .. } diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7466abeaf827..257329b881ec 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -60,7 +60,7 @@ let }; curl = { - configureFlags = ["--with-curl=${curl}"]; + configureFlags = ["--with-curl=${curl.dev}"]; buildInputs = [curl openssl]; }; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 2284c25cf661..c970b319a94d 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # curl: curl, curl-config rm opt/vagrant/embedded/bin/{curl,curl-config} ln -s ${curl.bin}/bin/curl opt/vagrant/embedded/bin - ln -s ${curl}/bin/curl-config opt/vagrant/embedded/bin + ln -s ${curl.dev}/bin/curl-config opt/vagrant/embedded/bin # libarchive: bsdtar, bsdcpio rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio} diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index b76168e68ed0..b77b5e831123 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--with-xml=${libxml2}" "--with-openssl=${openssl}" "--with-libncurses-prefix=${ncurses}" - "--with-libcurl=${curl}" + "--with-libcurl=${curl.dev}" "--with-pcre=${pcre}" "--enable-milter" "--disable-clamav" diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 95d3f8ce396a..e82d34cb9ae6 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-standalone-module" "--enable-static" - "--with-curl=${curl}" + "--with-curl=${curl.dev}" "--with-apxs=${apacheHttpd.dev}/bin/apxs" "--with-pcre=${pcre}" "--with-apr=${apr.dev}" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a3d4856034b3..da1fbef80dfd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7122,7 +7122,7 @@ in modules // { USE_NCCONFIG="0"; HDF5_DIR="${pkgs.hdf5}"; NETCDF4_DIR="${pkgs.netcdf}"; - CURL_DIR="${pkgs.curl}"; + CURL_DIR="${pkgs.curl.dev}"; JPEG_DIR="${pkgs.libjpeg}"; meta = { -- cgit 1.4.1 From 288912c2c44279e91bca635c5a99cced5347fbd0 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 19:52:29 +0300 Subject: treewide: Make explicit that 'dev' output of freetype is used --- pkgs/applications/display-managers/slim/default.nix | 2 +- pkgs/applications/misc/mrxvt/default.nix | 2 +- pkgs/applications/misc/rxvt_unicode/default.nix | 2 +- pkgs/development/compilers/hhvm/default.nix | 2 +- pkgs/development/interpreters/love/0.7.nix | 2 +- pkgs/development/interpreters/love/0.8.nix | 2 +- pkgs/development/interpreters/php/default.nix | 2 +- pkgs/development/libraries/opencascade/6.5.nix | 2 +- pkgs/development/libraries/opencascade/default.nix | 2 +- pkgs/development/libraries/silgraphite/default.nix | 2 +- pkgs/tools/misc/ttf2pt1/default.nix | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'pkgs/development/interpreters/php') diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index c77102629885..fca84199e511 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_PAM=1" ]; - NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype -std=c++11"; + NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype -std=c++11"; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix index b11b234eb43d..e8bf2f7a14c8 100644 --- a/pkgs/applications/misc/mrxvt/default.nix +++ b/pkgs/applications/misc/mrxvt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ]; preConfigure = '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"; + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2"; ''; src = fetchurl { diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 5d1eda5ec063..8fbe021cc8f7 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (rec { mkdir -p $terminfo/share/terminfo configureFlags="--with-terminfo=$terminfo/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"} ${if unicode3Support then "--enable-unicode3" else "--disable-unicode3"}"; export TERMINFO=$terminfo/share/terminfo # without this the terminfo won't be compiled by tic, see man tic - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2" + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2" NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender " '' # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 23f0484e8ead..eb9e5f7d3627 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { MYSQL_DIR=mariadb; # work around broken build system - NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; + NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2"; prePatch = '' substituteInPlace hphp/util/generate-buildinfo.sh \ diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 65f38ae1613d..76b08cd35c60 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = '' -I${SDL}/include/SDL - -I${freetype}include/freetype2 + -I${freetype.dev}include/freetype2 ''; meta = { diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index b12c2c405780..e73f831156a5 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = '' -I${SDL.dev}/include/SDL - -I${freetype}include/freetype2 + -I${freetype.dev}include/freetype2 ''; meta = { diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 257329b881ec..d258823b868a 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -133,7 +133,7 @@ let # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108. configureFlags = [ "--with-gd" - "--with-freetype-dir=${freetype}" + "--with-freetype-dir=${freetype.dev}" "--with-png-dir=${libpng}" "--with-jpeg-dir=${libjpeg}" ]; diff --git a/pkgs/development/libraries/opencascade/6.5.nix b/pkgs/development/libraries/opencascade/6.5.nix index 4228c285dfd5..904137c4d8cc 100644 --- a/pkgs/development/libraries/opencascade/6.5.nix +++ b/pkgs/development/libraries/opencascade/6.5.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # https://bugs.freedesktop.org/show_bug.cgi?id=83631 + " -DGLX_GLXEXT_LEGACY"; - configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ]; + configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype.dev}" ]; postInstall = '' mv $out/inc $out/include diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index ec15d9d631e6..536281d53725 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preUnpack = '' sourceRoot=`pwd`/ros/adm/cmake - cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}" + cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype.dev}" ''; # https://bugs.freedesktop.org/show_bug.cgi?id=83631 diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix index 8e8cdc0ce1cf..f124b313d74c 100644 --- a/pkgs/development/libraries/silgraphite/default.nix +++ b/pkgs/development/libraries/silgraphite/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [pkgconfig freetype libXft pango fontconfig]; - NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; + NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2"; meta = { description = "An advanced font engine"; diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index 5a03e0995393..da0c966eb5e1 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { mkdir -p $out sed -e 's/chown/true/' \ -e 's/chgrp/true/' \ - -e 's@^CFLAGS_FT =.*@CFLAGS_FT=-DUSE_FREETYPE -I${freetype}/include/freetype2@' \ + -e 's@^CFLAGS_FT =.*@CFLAGS_FT=-DUSE_FREETYPE -I${freetype.dev}/include/freetype2@' \ -i scripts/{inst_dir,inst_file} Makefile makeFlags="INSTDIR=$out OWNER=`id -u`" ''; -- cgit 1.4.1 From 47c45e20415643ecca52f8a0c0a4350b5ef84370 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 19:58:41 +0300 Subject: treewide: Make explicit that 'dev' output of gmp is used --- pkgs/applications/science/math/pari/default.nix | 2 +- pkgs/development/compilers/aliceml/default.nix | 2 +- pkgs/development/compilers/ecl/default.nix | 2 +- pkgs/development/compilers/gcc/4.5/default.nix | 2 +- pkgs/development/compilers/gcc/4.6/default.nix | 2 +- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/5/default.nix | 2 +- pkgs/development/compilers/gcc/gfortran-darwin.nix | 2 +- pkgs/development/compilers/ghc/7.0.4-binary.nix | 2 +- pkgs/development/compilers/ghc/7.4.2-binary.nix | 2 +- pkgs/development/compilers/ghc/8.0.1.nix | 2 +- pkgs/development/interpreters/guile/default.nix | 2 +- pkgs/development/interpreters/php/default.nix | 2 +- pkgs/development/tools/misc/gdb/default.nix | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) (limited to 'pkgs/development/interpreters/php') diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index be273bca0e2c..f98750e8af28 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureScript = "./Configure"; configureFlags = - "--with-gmp=${gmp} " + + "--with-gmp=${gmp.dev} " + "--with-readline=${readline}"; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 6fbc1a350f5c..2a59765b0f3b 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { ''; buildPhase = '' - gmp="${gmp}" zlib="${zlib}" PATH=$PATH:`pwd`/seam-support/install/bin make -C make all PREFIX="$out" + gmp="${gmp.dev}" zlib="${zlib}" PATH=$PATH:`pwd`/seam-support/install/bin make -C make all PREFIX="$out" ''; meta = { diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index ee7dffdf0652..eb4544879f6e 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { }; configureFlags = [ "--enable-threads" - "--with-gmp-prefix=${gmp}" + "--with-gmp-prefix=${gmp.dev}" "--with-libffi-prefix=${libffi}" ] ++ diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 6cde7aba92a0..ed72a3e27e94 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -234,7 +234,7 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp} + --with-gmp=${gmp.dev} --with-mpfr=${mpfr} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index bc968d1f66e3..2ce432d452fb 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -295,7 +295,7 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp} + --with-gmp=${gmp.dev} --with-mpfr=${mpfr} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 5089f703d5ed..4895c3a22cef 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -338,7 +338,7 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp} + --with-gmp=${gmp.dev} --with-mpfr=${mpfr} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 212413648236..dcd6feb8f893 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -345,7 +345,7 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp} + --with-gmp=${gmp.dev} --with-mpfr=${mpfr} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index d7ff8fe99dfc..e3b8cfc8efe9 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -339,7 +339,7 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp} + --with-gmp=${gmp.dev} --with-mpfr=${mpfr} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix index 66f273482cfb..1de3cc0ed11e 100644 --- a/pkgs/development/compilers/gcc/gfortran-darwin.nix +++ b/pkgs/development/compilers/gcc/gfortran-darwin.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --enable-checking=release --enable-languages=fortran --with-cloog=${cloog} - --with-gmp=${gmp} + --with-gmp=${gmp.dev} --with-isl=${isl_0_14} --with-mpc=${libmpc} --with-mpfr=${mpfr} diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 77e5229a2a0a..37eb3440ca42 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { configurePhase = '' ./configure --prefix=$out \ - --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp}/include \ + --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev}/include \ ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"} ''; diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index c9f281980d95..d851568d6598 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { configurePhase = '' ./configure --prefix=$out \ - --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp}/include \ + --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev}/include \ ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"} ''; diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index bb8a98d61b1f..1565ce2b3dbd 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib" + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" "--with-curses-includes=${ncurses}/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/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 847ae2997b85..333a022254b6 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -97,7 +97,7 @@ # /usr/include/mp.h from OpenSolaris. See # # for details. - "--with-libgmp-prefix=${gmp}" + "--with-libgmp-prefix=${gmp.dev}" # Same for these (?). "--with-libreadline-prefix=${readline}" diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index d258823b868a..37956dde422a 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -141,7 +141,7 @@ let }; gmp = { - configureFlags = ["--with-gmp=${gmp}"]; + configureFlags = ["--with-gmp=${gmp.dev}"]; buildInputs = [ gmp ]; }; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 32dcd72866ea..0e27cc7104e1 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = with stdenv.lib; - [ "--with-gmp=${gmp}" "--with-mpfr=${mpfr}" "--with-system-readline" + [ "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr}" "--with-system-readline" "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.dev}" "--with-separate-debug-dir=/run/current-system/sw/lib/debug" ] -- cgit 1.4.1 From be00816cabc1fa91069c1d0c25ff2f94acaf3b27 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 20:36:59 +0300 Subject: treewide: Make explicit that 'dev' output of libjpeg is used --- pkgs/applications/networking/instant-messengers/twinkle/default.nix | 2 +- pkgs/development/interpreters/php/default.nix | 2 +- pkgs/development/libraries/gdal/default.nix | 2 +- pkgs/development/libraries/gdal/gdal-1_11.nix | 2 +- pkgs/tools/graphics/graphviz/2.0.nix | 2 +- pkgs/tools/graphics/graphviz/2.32.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/development/interpreters/php') diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index b096023eaa42..90528b35140a 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./boost_regex.patch # modified not to use "-mt" suffix ]; - configureFlags = "--with-extra-includes=${libjpeg}/include"; + configureFlags = "--with-extra-includes=${libjpeg.dev}/include"; buildInputs = [ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 37956dde422a..3d455343dadb 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -135,7 +135,7 @@ let "--with-gd" "--with-freetype-dir=${freetype.dev}" "--with-png-dir=${libpng}" - "--with-jpeg-dir=${libjpeg}" + "--with-jpeg-dir=${libjpeg.dev}" ]; buildInputs = [ libpng libjpeg freetype ]; }; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 1607387160d2..47f7ebd3e501 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -29,7 +29,7 @@ composableDerivation.composableDerivation {} (fixed: rec { preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX"; configureFlags = [ - "--with-jpeg=${libjpeg}" + "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff}" # optional (without largetiff support) "--with-libpng=${libpng}" # optional "--with-libz=${zlib}" # optional diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 0e4b4d03541c..2735936dc283 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -24,7 +24,7 @@ composableDerivation.composableDerivation {} (fixed: rec { preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX"; configureFlags = [ - "--with-jpeg=${libjpeg}" + "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff}" # optional (without largetiff support) "--with-libpng=${libpng}" # optional "--with-libz=${zlib}" # optional diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 9799c83c8223..1fb49ac0e262 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-pngincludedir=${libpng}/include" "--with-pnglibdir=${libpng.out}/lib" - "--with-jpegincludedir=${libjpeg}/include" + "--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat.dev}/include" "--with-expatlibdir=${expat.out}/lib" diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index aa0f02d34c36..8339f22f3edb 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-pngincludedir=${libpng}/include" "--with-pnglibdir=${libpng.out}/lib" - "--with-jpegincludedir=${libjpeg}/include" + "--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat.dev}/include" "--with-expatlibdir=${expat.out}/lib" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f7f45849c33..b6e3f506e191 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7123,7 +7123,7 @@ in modules // { HDF5_DIR="${pkgs.hdf5}"; NETCDF4_DIR="${pkgs.netcdf}"; CURL_DIR="${pkgs.curl.dev}"; - JPEG_DIR="${pkgs.libjpeg}"; + JPEG_DIR="${pkgs.libjpeg.dev}"; meta = { description = "interface to netCDF library (versions 3 and 4)"; -- cgit 1.4.1 From 309b2644acb704ecf67371274e1f6363946f00e7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 20:37:32 +0300 Subject: treewide: Make explicit that 'dev' output of libpng is used --- pkgs/development/interpreters/php/default.nix | 2 +- pkgs/development/libraries/gdal/default.nix | 2 +- pkgs/development/libraries/gdal/gdal-1_11.nix | 2 +- pkgs/development/libraries/slang/default.nix | 2 +- pkgs/tools/graphics/graphviz/2.0.nix | 2 +- pkgs/tools/graphics/graphviz/2.32.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/development/interpreters/php') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 3d455343dadb..3e111b3538d1 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -134,7 +134,7 @@ let configureFlags = [ "--with-gd" "--with-freetype-dir=${freetype.dev}" - "--with-png-dir=${libpng}" + "--with-png-dir=${libpng.dev}" "--with-jpeg-dir=${libjpeg.dev}" ]; buildInputs = [ libpng libjpeg freetype ]; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 47f7ebd3e501..d01661113fe6 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -31,7 +31,7 @@ composableDerivation.composableDerivation {} (fixed: rec { configureFlags = [ "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff}" # optional (without largetiff support) - "--with-libpng=${libpng}" # optional + "--with-libpng=${libpng.dev}" # optional "--with-libz=${zlib}" # optional "--with-pg=${postgresql}/bin/pg_config" diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 2735936dc283..ddb760873965 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -26,7 +26,7 @@ composableDerivation.composableDerivation {} (fixed: rec { configureFlags = [ "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff}" # optional (without largetiff support) - "--with-libpng=${libpng}" # optional + "--with-libpng=${libpng.dev}" # optional "--with-libz=${zlib}" # optional "--with-pg=${postgresql}/bin/pg_config" diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index e83718673aae..70f7270f1b8f 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} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}"; + configureFlags = "--with-png=${libpng.dev} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}"; buildInputs = [ pcre libpng zlib readline ]; propagatedBuildInputs = [ ncurses ]; diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 1fb49ac0e262..0a11c3c8b283 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; configureFlags = - [ "--with-pngincludedir=${libpng}/include" + [ "--with-pngincludedir=${libpng.dev}/include" "--with-pnglibdir=${libpng.out}/lib" "--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpeglibdir=${libjpeg.out}/lib" diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 8339f22f3edb..695ac898fe8b 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo"; configureFlags = - [ "--with-pngincludedir=${libpng}/include" + [ "--with-pngincludedir=${libpng.dev}/include" "--with-pnglibdir=${libpng.out}/lib" "--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpeglibdir=${libjpeg.out}/lib" -- cgit 1.4.1 From 3672f3edcb35fc91669703cdeeac628820702f97 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 20:40:27 +0300 Subject: treewide: Make explicit that 'dev' output of libxslt is used --- pkgs/applications/version-management/redmine/default.nix | 2 +- pkgs/development/interpreters/php/default.nix | 2 +- pkgs/tools/text/xml/xmlstarlet/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/interpreters/php') diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 3a8df10f1661..7590ae743a37 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { mkdir -p vendor/cache ${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)} - bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt}" --with-xml2-dir="${libxml2}" + bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt.dev}" --with-xml2-dir="${libxml2}" bundle install --verbose --local --deployment diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 3e111b3538d1..54f90d7b5952 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -177,7 +177,7 @@ let }; xsl = { - configureFlags = ["--with-xsl=${libxslt}"]; + configureFlags = ["--with-xsl=${libxslt.dev}"]; buildInputs = [libxslt]; }; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index 74f7e08900a7..b390a9c404a3 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { preConfigure = '' - export LIBXSLT_PREFIX=${libxslt} + export LIBXSLT_PREFIX=${libxslt.dev} export LIBXML_PREFIX=${libxml2} export LIBXSLT_LIBS=$(pkg-config --libs libxslt libexslt) export LIBXML_LIBS=$(pkg-config --libs libxml-2.0) -- cgit 1.4.1 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(-) (limited to 'pkgs/development/interpreters/php') 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 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/development/interpreters/php') diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index dec3046464dc..d3573b6c9629 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 eccc0d66c2bd..18ffbe8c9a33 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 4f73fed34df2..3740cf18b1ea 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 13b633f4704e..897e82c68e1c 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 73e5def8be1b..3d09bc92cd30 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 0e2d335adac2..bae82bebfb7a 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 0b9287faf370..26603e377f02 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 974a636e559b..ef7d64b3e781 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 0b29ca1f42ac..fe50468c936a 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 d28c63fdcd8b..8ac9bbef8471 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/development/interpreters/php') diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index d3573b6c9629..c9a7a1a56d40 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 2a59765b0f3b..01a8a337fc0a 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 18ffbe8c9a33..7cee753d4d12 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 c9b6731ae343..e7d8bf1bc051 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 40c8178834e4..36019bdd7f71 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 fec52be924d9..06f8afba3341 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 47e61ddf2f68..86212eaeb473 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 2f2b3d3fc061..df2b5db89a74 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 d392b5f789c1..9025d94b8d5f 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 9314481cbcfe..7f2f8e9e4e58 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 <