diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/lua-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/php-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 22 |
5 files changed, 25 insertions, 25 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40bbe2843113..66782f4a2305 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8372,12 +8372,12 @@ in # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity grsecEnabled = true; + llvmPackages = llvmPackages_38; # various problems with 3.7; see #11367, #11467 }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); mesa_drivers = mesaDarwinOr ( let mo = mesa_noglu.override { grsecEnabled = config.grsecurity or false; - llvmPackages = llvmPackages_36; # various problems with 3.7; see #11367, #11467 }; in mo.drivers ); diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index abd4a8123416..980c0aca6332 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -271,7 +271,7 @@ let buildPhase = let luaVariable = "LUA_PATH=${luastdlib}/share/lua/${lua.luaversion}/?.lua"; - pcreVariable = "PCRE_DIR=${pcre}"; + pcreVariable = "PCRE_DIR=${pcre.dev}"; onigVariable = "ONIG_DIR=${oniguruma}"; gnuVariable = "GNU_INCDIR=${gnulib}/lib"; treVariable = "TRE_DIR=${tre}"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e0f2d4ef1fba..db1405ff8a8b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2038,7 +2038,7 @@ let self = _self // overrides; _self = with self; { # Don't build a private copy of bzip2. BUILD_BZIP2 = false; BZIP2_LIB = "${pkgs.bzip2.out}/lib"; - BZIP2_INCLUDE = "${pkgs.bzip2}/include"; + BZIP2_INCLUDE = "${pkgs.bzip2.dev}/include"; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; @@ -2590,7 +2590,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TT/TTAR/${name}.tar.gz"; sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908"; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; meta = with stdenv.lib; { homepage = https://metacpan.org/release/Crypt-OpenSSL-AES; @@ -2607,7 +2607,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/I/IR/IROBERTS/${name}.tar.gz"; sha256 = "18vg2bqyhc0ahfdh5dkbgph5nh92qcz5vi99jq8aam4h86if78bk"; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; }; @@ -2617,7 +2617,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; sha256 = "12pirh1pj8lpvzcwj2if9i6dbr6a7s9g1zc7gzbd3v87d6mx0rdf"; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; }; @@ -2628,7 +2628,7 @@ let self = _self // overrides; _self = with self; { sha256 = "5357f977464bb3a8184cf2d3341851a10d5515b4b2b0dfb88bf78995c0ded7be"; }; propagatedBuildInputs = [ CryptOpenSSLRandom ]; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; }; @@ -2638,7 +2638,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/N/NA/NANIS/${name}.tar.gz"; sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm"; }; - makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl}/include"; + makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl.dev}/include"; buildInputs = [ PathClass TryTiny ]; }; @@ -6877,7 +6877,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ ApacheTest ExtUtilsXSBuilder mod_perl2 pkgs.apacheHttpd pkgs.apr pkgs.aprutil ]; propagatedBuildInputs = [ mod_perl2 ]; - makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd} --with-apache2-apxs=${pkgs.apacheHttpd}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd --with-apr-config=${pkgs.apr}/bin/apr-1-config --with-apu-config=${pkgs.aprutil}/bin/apu-1-config"; + makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd.dev} --with-apache2-apxs=${pkgs.apacheHttpd.dev}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd --with-apr-config=${pkgs.apr.dev}/bin/apr-1-config --with-apu-config=${pkgs.aprutil.dev}/bin/apu-1-config"; preConfigure = '' # override broken prereq check substituteInPlace configure --replace "prereq_check=\"\$PERL \$PERL_OPTS build/version_check.pl\"" "prereq_check=\"echo\"" @@ -6888,7 +6888,7 @@ let self = _self // overrides; _self = with self; { installPhase = '' mkdir $out make install DESTDIR=$out - cp -r $out/${pkgs.apacheHttpd}/. $out/. + cp -r $out/${pkgs.apacheHttpd.dev}/. $out/. cp -r $out/$out/. $out/. rm -r $out/nix ''; @@ -9922,7 +9922,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ pkgs.imagemagick ]; preConfigure = '' - sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick}/include/ImageMagick";|' Makefile.PL + sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL ''; doCheck = false; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 700069220793..c0248644d5eb 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -45,7 +45,7 @@ let sha256 = "04c35rj0cvq5ygn2jgmyvqcb0k8d03v4k642b6i37zgv7x15pbic"; - configureFlags = "--with-zlib-dir=${pkgs.zlib}"; + configureFlags = "--with-zlib-dir=${pkgs.zlib.dev}"; }; memcached = if isPhp7 then memcachedPhp7 else memcached22; @@ -56,7 +56,7 @@ let sha256 = "0n4z2mp4rvrbmxq079zdsrhjxjkmhz6mzi7mlcipz02cdl7n1f8p"; configureFlags = [ - "--with-zlib-dir=${pkgs.zlib}" + "--with-zlib-dir=${pkgs.zlib.dev}" "--with-libmemcached-dir=${pkgs.libmemcached}" ]; @@ -74,7 +74,7 @@ let }; configureFlags = [ - "--with-zlib-dir=${pkgs.zlib}" + "--with-zlib-dir=${pkgs.zlib.dev}" "--with-libmemcached-dir=${pkgs.libmemcached}" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2406df879b8f..098570eb3a40 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7171,8 +7171,8 @@ in modules // { USE_NCCONFIG="0"; HDF5_DIR="${pkgs.hdf5}"; NETCDF4_DIR="${pkgs.netcdf}"; - CURL_DIR="${pkgs.curl}"; - JPEG_DIR="${pkgs.libjpeg}"; + CURL_DIR="${pkgs.curl.dev}"; + JPEG_DIR="${pkgs.libjpeg.dev}"; meta = { description = "interface to netCDF library (versions 3 and 4)"; @@ -7429,9 +7429,9 @@ in modules // { propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ]; preBuild = "${python}/bin/${python.executable} setup.py build_ext" + - " --include-dirs=${pkgs.poppler_qt4}/include/poppler/"; + " --include-dirs=${pkgs.poppler_qt4.dev}/include/poppler/"; - NIX_CFLAGS_COMPILE = "-I${pkgs.poppler_qt4}/include/poppler/"; + NIX_CFLAGS_COMPILE = "-I${pkgs.poppler_qt4.dev}/include/poppler/"; meta = { description = "A Python binding to Poppler-Qt4"; @@ -7867,7 +7867,7 @@ in modules // { cat > site.cfg << END [samplerate] library_dirs=${pkgs.libsamplerate.out}/lib - include_dirs=${pkgs.libsamplerate}/include + include_dirs=${pkgs.libsamplerate.dev}/include END ''; @@ -12080,7 +12080,7 @@ in modules // { buildInputs = with self; [ pkgs.swig2 pkgs.openssl ]; preConfigure = '' - substituteInPlace setup.py --replace "self.openssl = '/usr'" "self.openssl = '${pkgs.openssl}'" + substituteInPlace setup.py --replace "self.openssl = '/usr'" "self.openssl = '${pkgs.openssl.dev}'" ''; doCheck = false; # another test that depends on the network. @@ -17456,7 +17456,7 @@ in modules // { preConfigure = '' export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib" - export CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include" + export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include" ''; #+ optionalString isDarwin '' # export DYLD_LIBRARY_PATH="${pkgs.fftw.out}/lib" @@ -18267,7 +18267,7 @@ in modules // { sha256 = "0j5hzaar4d0vhnrlpmkczgwm7ci2wibr99a7zx04xddzrhxdpz82"; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl}/include/sasl"; + NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl.dev}/include/sasl"; propagatedBuildInputs = with self; [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl]; }; @@ -18708,7 +18708,7 @@ in modules // { ++ (if stdenv.isLinux then [pkgs.e2fsprogs] else []); # There seems to be no way to pass that path to configure. - NIX_CFLAGS_COMPILE="-I${pkgs.aprutil}/include/apr-1"; + NIX_CFLAGS_COMPILE="-I${pkgs.aprutil.dev}/include/apr-1"; preConfigure = '' cd Source @@ -18719,7 +18719,7 @@ in modules // { --apr-lib-dir=${pkgs.apr.out}/lib \ --svn-lib-dir=${pkgs.subversion.out}/lib \ --svn-bin-dir=${pkgs.subversion.out}/bin \ - --svn-root-dir=${pkgs.subversion} + --svn-root-dir=${pkgs.subversion.dev} '' + (if !stdenv.isDarwin then "" else '' sed -i -e 's|libpython2.7.dylib|lib/libpython2.7.dylib|' Makefile ''); @@ -26912,7 +26912,7 @@ in modules // { # Fix the USB backend library lookup postPatch = '' - libusb=${pkgs.libusb1}/include/libusb-1.0 + libusb=${pkgs.libusb1.dev}/include/libusb-1.0 test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py ''; |