diff options
234 files changed, 444 insertions, 533 deletions
diff --git a/lib/composable-derivation.nix b/lib/composable-derivation.nix index 8e8faae3982..e3e017d982d 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/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index 0fe8d1a89cf..b4b5a6fdc07 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -43,7 +43,7 @@ let # Paths to external programs. $wgDiff3 = "${pkgs.diffutils}/bin/diff3"; $wgDiff = "${pkgs.diffutils}/bin/diff"; - $wgImageMagickConvertCommand = "${pkgs.imagemagick}/bin/convert"; + $wgImageMagickConvertCommand = "${pkgs.imagemagick.out}/bin/convert"; #$wgDebugLogFile = "/tmp/mediawiki_debug_log.txt"; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 16996b9f96c..b8d19eb80c8 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -44,7 +44,7 @@ let ${cfg.extraGSettingsOverrides} EOF - ${pkgs.glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/ + ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/ ''; }; diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index 2981e7545e8..e74b19c8e71 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -169,10 +169,10 @@ in { config = mkIf cfg.enable { - services.xserver.modules = [ pkg ]; + services.xserver.modules = [ pkg.out ]; environment.etc."${etcFile}".source = - "${pkg}/share/X11/xorg.conf.d/50-synaptics.conf"; + "${pkg.out}/share/X11/xorg.conf.d/50-synaptics.conf"; environment.systemPackages = [ pkg ]; diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 400293d0e2e..8dad09c8920 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -438,7 +438,7 @@ in copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl - cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto + cc -O3 -I${pkgs.openssl.dev}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto strip -s pbkdf2-sha512 copy_bin_and_libs pbkdf2-sha512 diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index c7710262988..fca84199e51 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/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs-25/default.nix index 019015785e6..eaadd985be7 100644 --- a/pkgs/applications/editors/emacs-25/default.nix +++ b/pkgs/applications/editors/emacs-25/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { "--with-gif=no" "--with-tiff=no" ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX) - "-I${cairo}/include/cairo"; + "-I${cairo.dev}/include/cairo"; preBuild = '' find . -name '*.elc' -delete diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index 850041ccfc7..b4fb8d1937d 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i "w3m.el" \ -e 's|defcustom w3m-command nil|defcustom w3m-command "${w3m}/bin/w3m"|g ; - s|(w3m-which-command "display")|"${imagemagick}/bin/display"|g' + s|(w3m-which-command "display")|"${imagemagick.out}/bin/display"|g' sed -i "w3m-image.el" \ - -e 's|(w3m-which-command "convert")|"${imagemagick}/bin/convert"|g ; - s|(w3m-which-command "identify")|"${imagemagick}/bin/identify"|g' + -e 's|(w3m-which-command "convert")|"${imagemagick.out}/bin/convert"|g ; + s|(w3m-which-command "identify")|"${imagemagick.out}/bin/identify"|g' ''; configureFlags = [ diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 83165f0a505..f4d9d4ccdd5 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 poppler_qt4 zlib ]; nativeBuildInputs = [ pkgconfig poppler qmake4Hook ]; - NIX_CFLAGS_COMPILE="-I${poppler}/include/poppler"; + NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler"; preConfigure = '' qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps" diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 9b17fbde7f5..e73cc9024c6 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -43,7 +43,8 @@ stdenv.mkDerivation rec { patches = [ ./imagetragick.patch ] ++ cfg.patches; - outputs = [ "out" "doc" ]; + outputs = [ "dev" "out" "doc" ]; # bin/ isn't really big + outputMan = "out"; # it's tiny enableParallelBuilding = true; @@ -76,18 +77,23 @@ stdenv.mkDerivation rec { ; postInstall = '' - - (cd "$out/include" && ln -s ImageMagick* ImageMagick) + (cd "$dev/include" && ln -s ImageMagick* ImageMagick) + moveToOutput "bin/*-config" "$dev" + moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params + for file in "$dev"/bin/*-config; do + substituteInPlace "$file" --replace pkg-config \ + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'" + done '' + lib.optionalString (ghostscript != null) '' for la in $out/lib/*.la; do - sed 's|-lgs|-L${ghostscript}/lib -lgs|' -i $la + sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la done ''; meta = with stdenv.lib; { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; - platforms = platforms.linux ++ [ "x86_64-darwin" ]; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ the-kenny wkennington ]; }; } diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 453dc080995..f38e402ce92 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -71,7 +71,7 @@ let # Help digiKam find libusb, otherwise gphoto2 support is disabled cmakeFlags = [ "-DLIBUSB_LIBRARIES=${libusb1.out}/lib" - "-DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0" + "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0" "-DENABLE_BALOOSUPPORT=ON" "-DENABLE_KDEPIMLIBSSUPPORT=ON" "-DENABLE_LCMS2=ON" ] diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index 5223ae14c63..befdf1b4e7c 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { qmakeFlags = [ "EXIV2PATH=${exiv2}/include/exiv2" "OPENEXRDIR=${openexr}/include/OpenEXR" - "FFTW3DIR=${fftwSinglePrec}/include" - "LIBTIFFDIR=${libtiff}/include" + "FFTW3DIR=${fftwSinglePrec.dev}/include" + "LIBTIFFDIR=${libtiff.dev}/include" ]; meta = { diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 0cb8a082fc6..513b1a49198 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0cgqaaikrb10plhf6zxbgqy32zqpiwyi9dpx3g8yr261q72r5c81"; }; - NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; configureFlags = [ "--disable-gsettings-convert-install" ]; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index aa312f4c8a9..88e08b40914 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${poppler}/include/poppler" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${poppler.dev}/include/poppler" ''; buildInputs = [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 3b8ab7f07f3..83b782e65d6 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { installPhase = '' export HOME=$TMPDIR/fakehome - export POPPLER_INC_DIR=${poppler_utils}/include/poppler + export POPPLER_INC_DIR=${poppler_utils.dev}/include/poppler export POPPLER_LIB_DIR=${poppler_utils.out}/lib - export MAGICK_INC=${imagemagick}/include/ImageMagick - export MAGICK_LIB=${imagemagick}/lib + export MAGICK_INC=${imagemagick.dev}/include/ImageMagick + export MAGICK_LIB=${imagemagick.out}/lib export FC_INC_DIR=${fontconfig.dev}/include/fontconfig export FC_LIB_DIR=${fontconfig.lib}/lib export PODOFO_INC_DIR=${podofo}/include/podofo diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 666c3a40cdc..fd3d0b35729 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; preConfigure = '' - substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4} + substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4.dev} lrelease diffpdf.pro ''; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 2c9aaeda98f..4cec2ca41b6 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ openssl ]; - configureFlags = "--with-ssl=${openssl}"; + configureFlags = "--with-ssl=${openssl.dev}"; meta = { homepage = "http://www.fetchmail.info/"; diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index 613c56efcfd..e2c9bf49459 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sourceRoot = "GarminPlugin-0.3.26/src"; buildInputs = [ garmintools libusb libgcrypt pkgconfig tinyxml zlib ]; configureFlags = [ - "--with-libgcrypt-prefix=${libgcrypt}" + "--with-libgcrypt-prefix=${libgcrypt.dev}" "--with-garmintools-incdir=${garmintools}/include" "--with-garmintools-libdir=${garmintools}/lib" ]; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 934a7c69c99..ac8f876ad3f 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { echo "patching makefiles..." for i in Makefile src/Makefile server/Makefile do - sed -i "$i" -e "s|/usr/X11R6|${libX11}|g ; s|-lICE|-lX11 -lICE|g" + sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g" done ''; buildPhase = '' diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix index b11b234eb43..e8bf2f7a14c 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/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index 222dddc0e89..9753e6d4475 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/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 5d1eda5ec06..8fbe021cc8f 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/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 49a94ac3979..611527153ee 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals gtkSupport [ gtk ] ++ stdenv.lib.optionals qtSupport [ qt4 ]; patchPhase = '' - substituteInPlace configure --replace /usr/X11R6 ${xorg.libX11} + substituteInPlace configure --replace /usr/X11R6 ${xorg.libX11.dev} ''; preConfigure = stdenv.lib.optional qtSupport '' mkdir .bin diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 01c267cbbb4..0048cb73878 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite glib ]; - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 1a698b0effd..7a12b1247cf 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --enable-finger --enable-html-highlight --with-perl --enable-gopher --enable-cgi --enable-bittorrent --with-spidermonkey=${spidermonkey} - --enable-nntp --with-openssl=${openssl} + --enable-nntp --with-openssl=${openssl.dev} '' + stdenv.lib.optionalString enableGuile " --with-guile" + stdenv.lib.optionalString enablePython " --with-python"; diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index e7b5ba89db6..0d5d20b6579 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; configureFlags = [] - ++ stdenv.lib.optionals sslSupport [ "--with-ssl=${openssl}" ]; + ++ stdenv.lib.optionals sslSupport [ "--with-ssl=${openssl.dev}" ]; buildInputs = [ ncurses gzip ]; nativeBuildInputs = [ ncurses ]; diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 076b3faf11f..bc2c4ab8eee 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ln -s $out/libexec/w3m/w3mimgdisplay $out/bin ''; - configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}" + configureFlags = "--with-ssl=${openssl.dev} --with-gc=${boehmgc.dev}" + optionalString graphicsSupport " --enable-image=${optionalString x11Support "x11,"}fb"; preConfigure = '' diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 7efd34dee56..89337901f97 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' substituteInPlace configure.ac \ - --replace /usr/include/libnl3 ${libnl}/include/libnl3 + --replace /usr/include/libnl3 ${libnl.dev}/include/libnl3 substituteInPlace src/linux/perf.cpp \ --replace '"perf ' '"${perf}/bin/perf ' @@ -94,17 +94,17 @@ in stdenv.mkDerivation rec { configureFlags = [ "--sbindir=\${out}/bin" - "--with-apr=${apr}" - "--with-svn=${subversion}" + "--with-apr=${apr.dev}" + "--with-svn=${subversion.dev}" "--with-leveldb=${leveldb}" "--with-glog=${glog}" "--with-glog=${glog}" "--enable-optimize" "--disable-python-dependency-install" "--enable-ssl" - "--with-ssl=${openssl}" + "--with-ssl=${openssl.dev}" "--enable-libevent" - "--with-libevent=${libevent}" + "--with-libevent=${libevent.dev}" ] ++ lib.optionals stdenv.isLinux [ "--with-network-isolator" ]; diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index 54e2d813be8..d6921e1082b 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl curl ncurses libjpeg ] ++ stdenv.lib.optional withGpg gpgme; - configureFlags = [ "--with-openssl=${openssl}" ]; + configureFlags = [ "--with-openssl=${openssl.dev}" ]; meta = { homepage = http://www.centerim.org/; diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index da6bf44ced1..9c7204b7fa1 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-ldap-dir=${openldap}" - "--with-libsasl2-dir=${cyrus_sasl}" + "--with-ldap-dir=${openldap.dev}" + "--with-libsasl2-dir=${cyrus_sasl.dev}" "--with-boost-libdir=${boost.out}/lib" "--disable-gconf" ]; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index c894a49c20e..781d10cbc4f 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-ldap" - "--with-ffmpeg=${ffmpeg}" + "--with-ffmpeg=${ffmpeg.dev}" "--with-polarssl=${polarssl}" "--enable-lime" "--enable-external-ortp" diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index f32bdf96257..df1d0ee5e78 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ]; - configureFlags = "--with-openssl=${openssl} --enable-modules --enable-otr"; + configureFlags = "--with-openssl=${openssl.dev} --enable-modules --enable-otr"; doCheck = true; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 4a5522039c8..41a1ea3c3e7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; passthru = { - wrapArgs = "--prefix PATH ':' ${texLive}/bin:${imagemagick}/bin"; + wrapArgs = "--prefix PATH ':' ${texLive}/bin:${imagemagick.out}/bin"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index 133a15aebf8..1454760f541 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/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 87f68615c87..5d2cc9fa155 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -46,14 +46,14 @@ in stdenv.mkDerivation rec { "CONFIG+=release" "DEFINES+=TDESKTOP_DISABLE_AUTOUPDATE" "DEFINES+=TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" - "INCLUDEPATH+=${gtk2}/include/gtk-2.0" - "INCLUDEPATH+=${glib}/include/glib-2.0" + "INCLUDEPATH+=${gtk2.dev}/include/gtk-2.0" + "INCLUDEPATH+=${glib.dev}/include/glib-2.0" "INCLUDEPATH+=${glib.out}/lib/glib-2.0/include" - "INCLUDEPATH+=${cairo}/include/cairo" - "INCLUDEPATH+=${pango}/include/pango-1.0" + "INCLUDEPATH+=${cairo.dev}/include/cairo" + "INCLUDEPATH+=${pango.dev}/include/pango-1.0" "INCLUDEPATH+=${gtk2.out}/lib/gtk-2.0/include" - "INCLUDEPATH+=${gdk_pixbuf}/include/gdk-pixbuf-2.0" - "INCLUDEPATH+=${atk}/include/atk-1.0" + "INCLUDEPATH+=${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0" + "INCLUDEPATH+=${atk.dev}/include/atk-1.0" "INCLUDEPATH+=${libappindicator-gtk2}/include/libappindicator-0.1" "INCLUDEPATH+=${libunity}/include/unity" "INCLUDEPATH+=${dee}/include/dee-1.0" diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index b096023eaa4..90528b35140 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/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix index f36bbc00064..4484178a6d5 100644 --- a/pkgs/applications/networking/irc/wraith/default.nix +++ b/pkgs/applications/networking/irc/wraith/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { substituteInPlace src/libssl.cc --subst-var-by openssl ${openssl} substituteInPlace src/libcrypto.cc --subst-var-by openssl ${openssl} ''; - configureFlags = "--with-openssl=${openssl}"; + configureFlags = "--with-openssl=${openssl.dev}"; installPhase = '' mkdir -p $out/bin cp -a wraith $out/bin/wraith diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index 03c2c21aed0..8e5e8d5a0de 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { inherit (s) url sha256; }; configureFlags = [ - "--with-ssl-include-dir=${openssl}/include/openssl" + "--with-ssl-include-dir=${openssl.dev}/include/openssl" "--with-tcl-lib=${tcl.libPrefix}" ]; preConfigure = '' diff --git a/pkgs/applications/networking/mailreaders/realpine/default.nix b/pkgs/applications/networking/mailreaders/realpine/default.nix index c1835992158..2247398ef78 100644 --- a/pkgs/applications/networking/mailreaders/realpine/default.nix +++ b/pkgs/applications/networking/mailreaders/realpine/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { inherit (s) url sha256; }; configureFlags = [ - "--with-ssl-include-dir=${openssl}/include/openssl" + "--with-ssl-include-dir=${openssl.dev}/include/openssl" "--with-tcl-lib=${tcl.libPrefix}" ]; preConfigure = '' diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index dcfadbfa05f..f29493beb00 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { -e "s|/bin/rm|rm|" ''; - configureFlags = "--with-slang=${slang} --with-ssl=${openssl}"; + configureFlags = "--with-slang=${slang.dev} --with-ssl=${openssl.dev}"; buildInputs = [ slang ncurses openssl ]; diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 2e844fdeab4..dd9ca18cb1d 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { buildInputs = [openssl libX11]; configureFlags = [ - "--with-openssl=${openssl}" + "--with-openssl=${openssl.dev}" "--disable-credssp" "--disable-smartcard" ]; diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 971c19e9c3d..d28aa8e62a1 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { CPPFLAGS = "-DNDEBUG"; CFLAGS = "-O2 -fsigned-char"; CXXFLAGS = "-O2 -fsigned-char"; - GTK_CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I${gtk2.out}/lib/gtk-2.0/include -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0 -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include"; + GTK_CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I${gtk2.out}/lib/gtk-2.0/include -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0 -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0 -I${atk.dev}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include"; GTK_LIBS = "-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0"; installPhase = ''make MKDIR_P="mkdir -p" install''; diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index be273bca0e2..da10e89855a 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { configureScript = "./Configure"; configureFlags = - "--with-gmp=${gmp} " + - "--with-readline=${readline}"; + "--with-gmp=${gmp.dev} " + + "--with-readline=${readline.dev}"; meta = with stdenv.lib; { description = "Computer algebra system for high-performance number theory computations"; diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix index e8f9078a839..076d5d5dfe0 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "818673fe751b00a42b6ed3e78a783549fb09b5245a01dee47b3dded667bfc582"; }; - NIX_CFLAGS_COMPILE = [ "-I${apr}/include/apr-1" "-I${subversion.dev}/include/subversion-1" "-DVER=\"${src.rev}\"" ]; + NIX_CFLAGS_COMPILE = [ "-I${apr.dev}/include/apr-1" "-I${subversion.dev}/include/subversion-1" "-DVER=\"${src.rev}\"" ]; patchPhase = '' sed -i 's|/bin/cat|cat|' ./src/repository.cpp diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index b94978bb488..a3301d8acff 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; prePatch = '' - sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake + sed -i -e "s|/usr|${subversion.dev}|g" src/svnqt/cmakemodules/FindSubversion.cmake ''; buildInputs = [ apr aprutil subversion db kdelibs expat ]; diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 3a8df10f166..7590ae743a3 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/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index c2ad83a581c..e0c7030a762 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -43,14 +43,14 @@ 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 ${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-zlib=${zlib.dev} + --with-sqlite=${sqlite.dev} ''; preBuild = '' diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index fd7b31de16e..f8a35734534 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/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index e31ed7e509c..9e04cdf3825 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -39,7 +39,7 @@ buildPythonApplication rec { ''; postInstall = '' - ${glib}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas + ${glib.dev}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas ''; # Failed tests diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index a5decf21360..cdd406c42c9 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -133,7 +133,7 @@ in stdenv.mkDerivation { ${optionalString (!pulseSupport) "--disable-pulse"} \ ${optionalString (!enableHardening) "--disable-hardening"} \ --disable-kmods --with-mkisofs=${xorriso}/bin/xorrisofs - sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ + sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ -i AutoConfig.kmk sed -e 's@arch/x86/@@' \ -i Config.kmk diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index 652695b83e0..dd7f89b2a8d 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" lock sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" lock - sed -i -e "s|convert |${imagemagick}/bin/convert |" lock + sed -i -e "s|convert |${imagemagick.out}/bin/convert |" lock sed -i -e "s|awk -F|${gawk}/bin/awk -F|" lock sed -i -e "s| awk | ${gawk}/bin/awk |" lock sed -i -e "s|i3lock -n |${i3lock-color}/bin/i3lock-color -n |" lock diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index 518be964733..c90d2cd5201 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -6,8 +6,10 @@ dontStrip=1 fixupOutputHooks+=(_separateDebugInfo) _separateDebugInfo() { + [ -e "$prefix" ] || return 0 + local dst="${debug:-$out}" - if [ "$prefix" = "$dst" ]; then return; fi + if [ "$prefix" = "$dst" ]; then return 0; fi dst="$dst/lib/debug/.build-id" diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index b9dfeb76f99..55be87c9ab7 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = "--enable-png-creation"; - postInstall = '''${gtk}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" ''; + postInstall = '''${gtk.dev}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" ''; meta = { description = "A basic set of icons"; diff --git a/pkgs/desktops/enlightenment/elementary.nix b/pkgs/desktops/enlightenment/elementary.nix index ffb0d70920e..bf74a6c8b52 100644 --- a/pkgs/desktops/enlightenment/elementary.nix +++ b/pkgs/desktops/enlightenment/elementary.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "0avb0d6nk4d88l81c2j6py13vdfnvg080ycw2y3qvawyjf1mhska"; }; buildInputs = [ pkgconfig efl libdrm gdbm automake autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; - NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ]; + NIX_CFLAGS_COMPILE = [ "-I${libdrm.dev}/include/libdrm" ]; patches = [ ./elementary.patch ]; enableParallelBuilding = true; meta = { diff --git a/pkgs/desktops/gnome-3/3.18/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.18/apps/cheese/default.nix index db50656cf37..b5f70d84e52 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/cheese/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Cheese; diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/default.nix index cbd5a84bdb5..5fe6583660c 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/default.nix index 7f1f70114b7..5daa7277f7b 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preFixup = '' - substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication" + substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication" gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi') ''; diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/default.nix index eaace044af0..0ba1df2f5a5 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { # doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart diff --git a/pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix index 3b78babadd9..49c48a6b962 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr gnome3.gsettings_desktop_schemas makeWrapper gnupg diff --git a/pkgs/desktops/gnome-3/3.18/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.18/core/baobab/default.nix index 2ff85662bbb..874c7280949 100644 --- a/pkgs/desktops/gnome-3/3.18/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/baobab/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix index d0857a1d32a..7629e5b5655 100644 --- a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { (if supportXPS then "--enable-xps" else "--disable-xps") ]; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; preConfigure = with stdenv.lib; optionalString doCheck '' diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix index fef820010af..b2135535de1 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/default.nix index bf0ccd0224e..7265f09731f 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; # this should probably be setuphook for glib - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix index 51e3f6ab313..c94c178558d 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix index 3f9f653bdba..c329d68674a 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix index 54767dbc4c5..d0ec2307a85 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix index 15d93793088..29ebe8b0ca6 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix index 99e1f596f18..2a93328d8ca 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; buildInputs = with gnome3; [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix index 6b7b28ad400..50ee229cfa4 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix index e8f64983506..b1fb1eaf3dd 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; preConfigure = '' sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share/gsettings-schemas/$name mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name - ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas + ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas ''; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.18/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgdata/default.nix index bedbbee2dfe..8e934e211f8 100644 --- a/pkgs/desktops/gnome-3/3.18/core/libgdata/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/libgdata/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # TODO: need libuhttpmock configureFlags = "--disable-tests"; - NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; + NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; buildInputs = with gnome3; [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection diff --git a/pkgs/desktops/gnome-3/3.18/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.18/core/mutter/default.nix index dd08a96cc23..a128990b402 100644 --- a/pkgs/desktops/gnome-3/3.18/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/mutter/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; diff --git a/pkgs/desktops/gnome-3/3.18/core/totem/default.nix b/pkgs/desktops/gnome-3/3.18/core/totem/default.nix index cc35ede88f3..5ffdbc68cb7 100644 --- a/pkgs/desktops/gnome-3/3.18/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/totem/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; diff --git a/pkgs/desktops/gnome-3/3.18/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/3.18/misc/pidgin/default.nix index a2d8d146579..64f7920d9af 100644 --- a/pkgs/desktops/gnome-3/3.18/misc/pidgin/default.nix +++ b/pkgs/desktops/gnome-3/3.18/misc/pidgin/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas" mkdir -p "$schemas_dir" mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */ - ${glib}/bin/glib-compile-schemas "$schemas_dir" + ${glib.dev}/bin/glib-compile-schemas "$schemas_dir" locale_dir="$share_dir/locale" mkdir -p "$locale_dir" diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix index 58c2325f5c4..e3d9176b816 100644 --- a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix @@ -34,7 +34,7 @@ plasmaPackage rec { }) ./0003-tzdir.patch ]; - NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ]; + NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ]; cmakeFlags = [ "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include/xorg" "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg" diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 6fbc1a350f5..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}" 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/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index ee7dffdf065..d4bfc93df93 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation { }; configureFlags = [ "--enable-threads" - "--with-gmp-prefix=${gmp}" - "--with-libffi-prefix=${libffi}" + "--with-gmp-prefix=${gmp.dev}" + "--with-libffi-prefix=${libffi.dev}" ] ++ (stdenv.lib.optional (! noUnicode) diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 6cde7aba92a..b1eedf7707d 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation ({ ++ stdenv.lib.optional (libpthread != null) libpthread; extraCPPSpec = concatStrings (intersperse " " - (map (x: "-I${x}/include") extraCPPDeps)); + (map (x: "-I${x.dev or x}/include") extraCPPDeps)); extraLibSpec = if libpthreadCross != null then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" @@ -234,8 +234,8 @@ 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-mpfr=${mpfr} + --with-gmp=${gmp.dev} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -323,7 +323,7 @@ stdenv.mkDerivation ({ # Likewise, the LTO code doesn't find zlib. CPATH = concatStrings - (intersperse ":" (map (x: x + "/include") + (intersperse ":" (map (x: "${x.dev or x}/include") (optionals (zlib != null) [ zlib ] ++ optionals langJava [ boehmgc ] ++ optionals javaAwtGtk xlibs diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index bc968d1f66e..7003f4335c8 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -215,7 +215,7 @@ stdenv.mkDerivation ({ ++ stdenv.lib.optional (libpthread != null) libpthread; extraCPPSpec = concatStrings (intersperse " " - (map (x: "-I${x}/include") extraCPPDeps)); + (map (x: "-I${x.dev or x}/include") extraCPPDeps)); extraLibSpec = if libpthreadCross != null then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" @@ -295,8 +295,8 @@ 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-mpfr=${mpfr} + --with-gmp=${gmp.dev} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -398,7 +398,7 @@ stdenv.mkDerivation ({ # Likewise, the LTO code doesn't find zlib. CPATH = concatStrings - (intersperse ":" (map (x: x + "/include") + (intersperse ":" (map (x: "${x.dev or x}/include") (optionals (zlib != null) [ zlib ] ++ optionals langJava [ boehmgc ] ++ optionals javaAwtGtk xlibs diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 5089f703d5e..6810b52574c 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -241,7 +241,7 @@ stdenv.mkDerivation ({ ++ stdenv.lib.optional (libpthread != null) libpthread; extraCPPSpec = concatStrings (intersperse " " - (map (x: "-I${x}/include") extraCPPDeps)); + (map (x: "-I${x.dev or x}/include") extraCPPDeps)); extraLibSpec = if libpthreadCross != null then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" @@ -338,8 +338,8 @@ 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-mpfr=${mpfr} + --with-gmp=${gmp.dev} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -460,7 +460,7 @@ stdenv.mkDerivation ({ # Likewise, the LTO code doesn't find zlib. CPATH = concatStrings - (intersperse ":" (map (x: x + "/include") + (intersperse ":" (map (x: "${x.dev or x}/include") (optionals (zlib != null) [ zlib ] ++ optionals langJava [ boehmgc ] ++ optionals javaAwtGtk xlibs diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 21241364823..195a7b03eed 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -244,7 +244,7 @@ stdenv.mkDerivation ({ ++ stdenv.lib.optional (libpthread != null) libpthread; extraCPPSpec = concatStrings (intersperse " " - (map (x: "-I${x}/include") extraCPPDeps)); + (map (x: "-I${x.dev or x}/include") extraCPPDeps)); extraLibSpec = if libpthreadCross != null then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" @@ -345,8 +345,8 @@ 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-mpfr=${mpfr} + --with-gmp=${gmp.dev} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -467,7 +467,7 @@ stdenv.mkDerivation ({ # Likewise, the LTO code doesn't find zlib. CPATH = concatStrings - (intersperse ":" (map (x: x + "/include") + (intersperse ":" (map (x: "${x.dev or x}/include") (optionals (zlib != null) [ zlib ] ++ optionals langJava [ boehmgc ] ++ optionals javaAwtGtk xlibs diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index d7ff8fe99df..9e0220ffc72 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -242,7 +242,7 @@ stdenv.mkDerivation ({ ++ stdenv.lib.optional (libpthread != null) libpthread; extraCPPSpec = concatStrings (intersperse " " - (map (x: "-I${x}/include") extraCPPDeps)); + (map (x: "-I${x.dev or x}/include") extraCPPDeps)); extraLibSpec = if libpthreadCross != null then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" @@ -339,8 +339,8 @@ 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-mpfr=${mpfr} + --with-gmp=${gmp.dev} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -460,7 +460,7 @@ stdenv.mkDerivation ({ # Likewise, the LTO code doesn't find zlib. CPATH = concatStrings - (intersperse ":" (map (x: x + "/include") + (intersperse ":" (map (x: "${x.dev or x}/include") (optionals (zlib != null) [ zlib ] ++ optionals langJava [ boehmgc ] ++ optionals javaAwtGtk xlibs diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 5b206a63daa..22107e72ef7 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -201,23 +201,20 @@ postConfigure() { preInstall() { - # Make ‘lib64’ a symlink to ‘lib’. + # Make ‘lib64’ symlinks to ‘lib’. if [ -n "$is64bit" -a -z "$enableMultilib" ]; then - mkdir -p $out/lib - ln -s lib $out/lib64 + mkdir -p "$out/lib" + ln -s lib "$out/lib64" + mkdir -p "$lib/lib" + ln -s lib "$lib/lib64" fi } postInstall() { - mkdir -p "$lib" # some configs don't have anything to put into $lib - # Move runtime libraries to $lib. moveToOutput "lib/lib*.so*" "$lib" moveToOutput "lib/lib*.la" "$lib" - if [ -d "$lib/lib" ]; then - ln -s lib "$lib/lib64" # for *.la - fi moveToOutput "share/gcc-*/python" "$lib" for i in "$lib"/lib/*.{la,py}; do diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix index 66f273482cf..7fa58a053b4 100644 --- a/pkgs/development/compilers/gcc/gfortran-darwin.nix +++ b/pkgs/development/compilers/gcc/gfortran-darwin.nix @@ -21,10 +21,10 @@ 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} + --with-mpfr=${mpfr.dev} --with-native-system-header-dir=${Libsystem}/include --with-system-zlib ''; diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 77e5229a2a0..f0f54252b3f 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 or gmp}/lib --with-gmp-includes=${gmp.dev or gmp}/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 c9f281980d9..07137578585 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 or gmp}/lib --with-gmp-includes=${gmp.dev or gmp}/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 f129e850367..612c237735c 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib" - "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses.out}/lib" + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.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/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 23f0484e8ea..eb9e5f7d362 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/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 59e8055efb2..7471974d00a 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_REQUIRES_RTTI=1" - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev or binutils}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index f16b6981dea..64df30dc23f 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DCMAKE_CXX_FLAGS=-stdlib=libc++" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix index 2ccf9d1ed71..5941d788356 100644 --- a/pkgs/development/compilers/llvm/3.6/llvm.nix +++ b/pkgs/development/compilers/llvm/3.6/llvm.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DCMAKE_CXX_FLAGS=-stdlib=libc++" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index be527d87375..3a7829eca6d 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index f586fd0c752..ef929dec68b 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 74f85b1519c..de9339bb8a2 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { cmakeFlags = with stdenv; [ "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 66e62f8965e..0e26526ba16 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ./autogen.sh ''; - configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc}"; + configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc.dev}"; buildPhase = "make 3-stage-bootstrap"; postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin"; diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 5fbfd8a96ac..eebc8a56765 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure ''; - configureFlags = "--with-openssl=${openssl}"; + configureFlags = "--with-openssl=${openssl.dev}"; preConfigure = '' export PGHEADER="${postgresql}/include/libpq-fe.h"; diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index 7ae7af30717..6eb89bbf89b 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sed -e s@/bin/pwd@pwd@g -i otp_build ''; - configureFlags= "--with-ssl=${openssl} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; + configureFlags= "--with-ssl=${openssl.dev} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; postInstall = let manpages = fetchurl { diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index b32e3af9865..c597a44a890 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; configureFlags= [ - "--with-ssl=${openssl}" + "--with-ssl=${openssl.dev}" ] ++ optional enableHipe "--enable-hipe" ++ optional wxSupport "--enable-wx" ++ optional odbcSupport "--with-odbc=${unixODBC}" diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 2fc91d6a2db..42289d2467b 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; configureFlags= [ - "--with-ssl=${openssl}" + "--with-ssl=${openssl.dev}" ] ++ optional enableHipe "--enable-hipe" ++ optional wxSupport "--enable-wx" ++ optional odbcSupport "--with-odbc=${unixODBC}" diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 847ae2997b8..25fa3d0bc74 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -97,10 +97,10 @@ # /usr/include/mp.h from OpenSolaris. See # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> # for details. - "--with-libgmp-prefix=${gmp}" + "--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/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 65f38ae1613..76b08cd35c6 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 b12c2c40578..e73f831156a 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 e62d973cbf4..d364bf7dfff 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]; }; @@ -69,7 +69,7 @@ let }; zlib = { - configureFlags = ["--with-zlib=${zlib}"]; + configureFlags = ["--with-zlib=${zlib.dev}"]; buildInputs = [zlib]; }; @@ -85,12 +85,12 @@ let }; readline = { - configureFlags = ["--with-readline=${readline}"]; + configureFlags = ["--with-readline=${readline.dev}"]; buildInputs = [ readline ]; }; sqlite = { - configureFlags = ["--with-pdo-sqlite=${sqlite}"]; + configureFlags = ["--with-pdo-sqlite=${sqlite.dev}"]; buildInputs = [ sqlite ]; }; @@ -133,15 +133,15 @@ 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-png-dir=${libpng}" - "--with-jpeg-dir=${libjpeg}" + "--with-freetype-dir=${freetype.dev}" + "--with-png-dir=${libpng.dev}" + "--with-jpeg-dir=${libjpeg.dev}" ]; buildInputs = [ libpng libjpeg freetype ]; }; gmp = { - configureFlags = ["--with-gmp=${gmp}"]; + configureFlags = ["--with-gmp=${gmp.dev}"]; buildInputs = [ gmp ]; }; @@ -177,7 +177,7 @@ let }; xsl = { - configureFlags = ["--with-xsl=${libxslt}"]; + configureFlags = ["--with-xsl=${libxslt.dev}"]; buildInputs = [libxslt]; }; @@ -187,7 +187,7 @@ let }; bz2 = { - configureFlags = ["--with-bz2=${bzip2}"]; + configureFlags = ["--with-bz2=${bzip2.dev}"]; buildInputs = [bzip2]; }; diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 4adaea04ec1..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}" "${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/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index 7ddb78d052e..a6cdf9eb860 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/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 6f0956f1d1d..8df7be4a7d1 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { buildInputs = optional stdenv.isFreeBSD autoreconfHook; - configureFlags = [ "--with-apr=${apr}" "--with-expat=${expat}" ] + configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] ++ optional (!stdenv.isCygwin) "--with-crypto" - ++ optional sslSupport "--with-openssl=${openssl}" + ++ optional sslSupport "--with-openssl=${openssl.dev}" ++ optional bdbSupport "--with-berkeley-db=${db}" ++ optional ldapSupport "--with-ldap=ldap" ++ optionals stdenv.isCygwin diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index f3538a12221..b8f86f1fa22 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -2,14 +2,14 @@ , intltool, dbus_glib, at_spi2_core, libSM }: stdenv.mkDerivation rec { - versionMajor = "2.18"; + versionMajor = "2.20"; versionMinor = "1"; moduleName = "at-spi2-atk"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "0bf1g5cj84rmx7p1q547vwbc0hlpcs2wrxnmv96lckfkhs9mzcf4"; + sha256 = "2358a794e918e8f47ce0c7370eee8fc8a6207ff1afe976ec9ff547a03277bf8e"; }; buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index e49569bc226..e3c558057c8 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -2,14 +2,14 @@ , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation rec { - versionMajor = "2.18"; - versionMinor = "3"; + versionMajor = "2.20"; + versionMinor = "1"; moduleName = "at-spi2-core"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "0afn4x04j5l352vj0dccb2hkpzg3l2vhr8h1yv89fpqmjkfnm8md"; + sha256 = "6ed858e781f5aa9a9662b3beb5ef82f733dac040afc8255d85dffd2097f16900"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 14e2e71c0bd..d75fd235301 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }: let - ver_maj = "2.18"; + ver_maj = "2.20"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz"; - sha256 = "ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b"; + sha256 = "493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/coprthr/default.nix b/pkgs/development/libraries/coprthr/default.nix index 40be21131d2..5630daa0d93 100644 --- a/pkgs/development/libraries/coprthr/default.nix +++ b/pkgs/development/libraries/coprthr/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-libelf=${libelf}" - "--with-libevent=${libevent}" + "--with-libevent=${libevent.dev}" "--with-libconfig=${libconfig}" "--with-opencl-icd-path=$out/etc/OpenCL/vendors" "--enable-user-install" diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index f1cd9d526e4..366e5f613a9 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ); configureFlags = [ - "--with-openssl=${openssl}" + "--with-openssl=${openssl.dev}" ]; # Set this variable at build-time to make sure $out can be evaluated. diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index d06a919cada..376c4de3b5f 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { - name = "dbus-glib-0.104"; + name = "dbus-glib-0.106"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz"; + sha256 = "0in0i6v68ixcy0ip28i84hdczf10ykq9x682qgcvls6gdmq552dk"; }; outputs = [ "dev" "out" "docdev" ]; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 1607387160d..36019bdd7f7 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -29,10 +29,10 @@ composableDerivation.composableDerivation {} (fixed: rec { preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX"; configureFlags = [ - "--with-jpeg=${libjpeg}" - "--with-libtiff=${libtiff}" # optional (without largetiff support) - "--with-libpng=${libpng}" # optional - "--with-libz=${zlib}" # optional + "--with-jpeg=${libjpeg.dev}" + "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) + "--with-libpng=${libpng.dev}" # 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 0e4b4d03541..06f8afba334 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -24,10 +24,10 @@ composableDerivation.composableDerivation {} (fixed: rec { preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX"; configureFlags = [ - "--with-jpeg=${libjpeg}" - "--with-libtiff=${libtiff}" # optional (without largetiff support) - "--with-libpng=${libpng}" # optional - "--with-libz=${zlib}" # optional + "--with-jpeg=${libjpeg.dev}" + "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) + "--with-libpng=${libpng.dev}" # 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/ggz_base_libs/default.nix b/pkgs/development/libraries/ggz_base_libs/default.nix index 5e3adb0ace2..631160487d8 100644 --- a/pkgs/development/libraries/ggz_base_libs/default.nix +++ b/pkgs/development/libraries/ggz_base_libs/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool openssl expat libgcrypt ]; configureFlags = [ - "--with-ssl-dir=${openssl}/" + "--with-ssl-dir=${openssl.dev}/" "--with-tls" ]; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index b3b9dfcef16..3c044bb6efa 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -40,7 +40,7 @@ let ''; ver_maj = "2.48"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "0d3w2hblrw7vvpx60l1kbvb830ygn3v8zhwdz65cc5593j9ycjvl"; + sha256 = "74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index f3ebc189cd7..faaff415f5f 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xorg.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.29"; + name = "gtk+-2.24.30"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "1f1ifv1ijrda4jx831l24d3ww65v5gf56r464fi11n6k02bcah87"; + sha256 = "0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50"; }; outputs = [ "dev" "out" "docdev" ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index b1991ada402..e6c95963865 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -12,7 +12,7 @@ with stdenv.lib; let ver_maj = "3.20"; - ver_min = "3"; + ver_min = "5"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "3834f3bf23b260b3e5ebfea41102e2026a8af29e36c3620edf4a5cf05e82f694"; + sha256 = "9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 45f5217d3c9..755a4e8fcdc 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ]; postInstall = '' - ln -sv ${libsoup}/include/*/libsoup $out/include + ln -sv ${libsoup.dev}/include/*/libsoup $out/include ln -sv ${libxml2.dev}/include/*/libxml $out/include ln -sv ${gssdp}/include/*/libgssdp $out/include ''; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 2d84b1e73a8..4d8f005bf88 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.1.2"; + version = "1.2.7"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "07s6z3hbrb4rdfgzmln169wxz4nm5y7qbr02ik5c7drxpn85fb2a"; + sha256 = "09lh8x6qj0cd950whgaqqi3c4pqbl6z7aw9ddm73i14bw056185v"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 175d0c7bc3b..3740cf18b1e 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--enable-hdb-openldap-module" - "--with-sqlite3=${sqlite}" + "--with-sqlite3=${sqlite.dev}" "--with-libedit=${libedit}" - "--with-openssl=${openssl}" + "--with-openssl=${openssl.dev}" "--without-x" "--with-berkeley-db=${db}" ] ++ optionals (!libOnly) [ - "--with-openldap=${openldap}" + "--with-openldap=${openldap.dev}" ] ++ optionals (!stdenv.isFreeBSD) [ "--with-capng" ]; diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index b1f81549ef0..c279d698e12 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; buildInputs = [ openssl ]; - configureFlags = [ "--with-ssl=${openssl}" "--with-drill" ]; + configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill" ]; meta = with stdenv.lib; { description = "Library with the aim of simplifying DNS programming in C"; diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index 4dca6b57c75..9fb01df930a 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libclthreads libX11 libXft xorg.xproto ]; - NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft}/include"; + NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft.dev}/include"; patchPhase = '' sed -e "s@ldconfig@@" -i Makefile diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index ad524ffeb02..d2bb05a3bb6 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }: stdenv.mkDerivation rec { - name = "libdrm-2.4.66"; + name = "libdrm-2.4.68"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "79cb8e988749794edfb2d777b298d5292eff353bbbb71ed813589e61d2bc2d76"; + sha256 = "5b4bd9a5922929bc716411cb74061fbf31b06ba36feb89bc1358a91a8d0ca9df"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index 1dd71024681..39de886a0b7 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl curl ]; configureFlags = [ - "--with-openssl=${openssl}" + "--with-openssl=${openssl.dev}" "--with-cafile=/etc/ssl/certs/ca-certificates.crt" ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index a5a0e1d42a3..71b7b2e18ef 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,11 +3,11 @@ assert zlib != null; let - version = "1.6.20"; - sha256 = "12wis4rlisfnw79pj2778m42m94xpi9nq8m385hxk11lkyg9biam"; + version = "1.6.21"; + sha256 = "10r0xqasm8fi0dx95bpca63ab4myb8g600ypyndj2r4jxd4ii3vc"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; - sha256 = "11xgal9qk6fmqdgcb37xg55f2y58wizszw54p1pyq855d2xpwfz6"; + sha256 = "0wwcc52yzjaxvpfkicz20j7yzpy02hpnsm4jjlvw74gy4qjhx9vd"; }; whenPatched = stdenv.lib.optionalString apngSupport; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 7229b10e01c..45ce1b55592 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,13 +1,20 @@ -{ stdenv, lib, fetchurl, zlib, xz, python, findXMLCatalogs, libiconv +{ stdenv, lib, fetchurl, zlib, xz, python, findXMLCatalogs, libiconv, fetchpatch , supportPython ? (! stdenv ? cross) }: stdenv.mkDerivation rec { name = "libxml2-${version}"; - version = "2.9.3"; + version = "2.9.4"; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; - sha256 = "0bd17g6znn2r98gzpjppsqjg33iraky4px923j3k8kdl8qgy7sad"; + sha256 = "0g336cr0bw6dax1q48bblphmchgihx9p1pjmxdnrd6sh3qci3fgz"; + }; + + # https://bugzilla.gnome.org/show_bug.cgi?id=766834#c5 + postPatch = "patch -R < " + fetchpatch { + name = "schemas-validity.patch"; + url = "https://git.gnome.org/browse/libxml2/patch/?id=f6599c5164"; + sha256 = "0i7a0nhxwkxx6dkm8917qn0bsfn1av6ghg2f4dxanxi4bn4b1jjn"; }; outputs = [ "dev" "out" "bin" "doc" ] @@ -27,6 +34,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = !stdenv.isDarwin; + crossAttrs = lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { # creating the DLL is broken ATM dontDisableStatic = true; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2fe27ac087b..5ddc7bf3ddb 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -23,7 +23,7 @@ else with { inherit (stdenv.lib) optional optionalString; }; let - version = "11.1.3"; + version = "11.2.2"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -38,7 +38,7 @@ stdenv.mkDerivation { + head (splitString "." version) + ''.x/${version}/mesa-${version}.tar.xz'') "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "51f6658a214d75e4d9f05207586d7ed56ebba75c6b10841176fb6675efa310ac"; + sha256 = "40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/opencascade/6.5.nix b/pkgs/development/libraries/opencascade/6.5.nix index 4228c285dfd..904137c4d8c 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 ec15d9d631e..536281d5372 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/pango/default.nix b/pkgs/development/libraries/pango/default.nix index c4456035cca..105bfa1627b 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; let - ver_maj = "1.38"; + ver_maj = "1.40"; ver_min = "1"; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; - sha256 = "1dsf45m51i4rcyvh5wlxxrjfhvn5b67d5ckjc6vdcxbddjgmc80k"; + sha256 = "e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40"; }; outputs = [ "dev" "out" "bin" "docdev" ]; diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index f3e2312f484..1886038dff3 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -96,7 +96,7 @@ in rec { dontDisableStatic = true; preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c}" + configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" ''; postConfigure = '' sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 20ce1dabf9a..86212eaeb47 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr}"/bin/*-config)" \ - APU="$(echo "${aprutil}"/bin/*-config)" CC="${ + 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" }" ${ if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\"" diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix index 8e8cdc0ce1c..f124b313d74 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/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index e83718673aa..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} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}"; + 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/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 46ecada9668..e6fb5a2b685 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs ./scons - ./scons openssl=${openssl} \ + ./scons openssl=${openssl.dev} \ boost_includedir=${boost.dev}/include \ boost_libdir=${boost.out}/lib \ boost_bundled_enable=false \ diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 89b2d77db82..3a37afc1cbe 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "xine-lib-1.2.4"; - + name = "xine-lib-1.2.6"; + src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "1pdv7bs683ily548arv4wsxabslyf3x3laij5jb921dxyx71nnww"; + sha256 = "01d0nv4zhr4k8id5n4rmw13llrjsv9dhwg1a773c1iqpi1ris15x"; }; nativeBuildInputs = [ pkgconfig perl ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec ]; - NIX_LDFLAGS = "-rpath ${libdvdcss}/lib -L${libdvdcss}/lib -ldvdcss"; - + NIX_LDFLAGS = "-lxcb-shm"; + propagatedBuildInputs = [zlib]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index d0de624890b..ced0844f3e1 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "07pnc7kmjpd0ncm32z6s3ny5p4zl52v9lld0n0f8sp6cw87k12p0"; }; - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; configureScript = "./autogen.sh"; 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 <<EOF BUILD_ZLIB = False - INCLUDE = ${zlib}/include + INCLUDE = ${zlib.dev}/include LIB = ${zlib.out}/lib OLD_ZLIB = False GZIP_OS_CODE = AUTO_DETECT 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/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index b56ba6eb22e..af2e6af0c82 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,19 +1,23 @@ -{ stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy }: +{ stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy +, ncurses }: if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - name = "dbus-python-1.2.0"; + name = "dbus-python-1.2.4"; src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz"; - sha256 = "1py62qir966lvdkngg0v8k1khsqxwk5m4s8nflpk1agk5f5nqb71"; + sha256 = "1k7rnaqrk7mdkg0k6n2jn3d1mxsl7s3i07g5a8va5yvl3y3xdwg2"; }; postPatch = "patchShebangs ."; buildInputs = [ python pkgconfig dbus dbus_glib ] - ++ stdenv.lib.optional doCheck dbus_tools; + ++ stdenv.lib.optional doCheck dbus_tools + # My guess why it's sometimes trying to -lncurses. + # It seems not to retain the dependency anyway. + ++ stdenv.lib.optional (! python ? modules) ncurses; - doCheck = false; # https://bugs.freedesktop.org/show_bug.cgi?id=57140 + doCheck = true; # Set empty pythonPath, so that the package is recognized as a python package # for python.buildEnv diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index b3003dfa954..88a39400c77 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { setupPyBuildFlags = [ "--hdf5=${hdf5}" "--lzo=${lzo}" - "--bzip2=${bzip2}" + "--bzip2=${bzip2.dev}" ]; # Run the test suite. diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 99cb9d03ab6..c7eeb431bb6 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1860,7 +1860,7 @@ let Rmpfr = old.Rmpfr.overrideDerivation (attrs: { configureFlags = [ - "--with-mpfr-include=${pkgs.mpfr}/include" + "--with-mpfr-include=${pkgs.mpfr.dev}/include" ]; }); @@ -1922,7 +1922,7 @@ let }); openssl = old.openssl.overrideDerivation (attrs: { - OPENSSL_INCLUDES = "${pkgs.openssl}/include"; + OPENSSL_INCLUDES = "${pkgs.openssl.dev}/include"; }); Rserve = old.Rserve.overrideDerivation (attrs: { diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 1349a4a53ac..64cacc976f4 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -90,7 +90,7 @@ in nokogiri = attrs: { buildFlags = [ "--use-system-libraries" - "--with-zlib-dir=${zlib}" + "--with-zlib-dir=${zlib.dev}" "--with-xml2-lib=${libxml2.out}/lib" "--with-xml2-include=${libxml2.dev}/include/libxml2" "--with-xslt-lib=${libxslt.out}/lib" diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 223f1968274..4685787af5f 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/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 472bb4de58b..6635044ce67 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = with stdenv.lib; - [ "--with-gmp=${gmp}" "--with-mpfr=${mpfr}" "--with-system-readline" - "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat}" + [ "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" "--with-system-readline" + "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.dev}" "--with-separate-debug-dir=/run/current-system/sw/lib/debug" ] ++ optional (target != null) "--target=${target.config}" diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index e6b81ca7eb1..3d09bc92cd3 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ltdl-include=${libtool}/include" "--with-ltdl-lib=${libtool.lib}/lib" - "--with-ncurses=${ncurses}" - "--with-sqlite3=${sqlite}" + "--with-ncurses=${ncurses.dev}" + "--with-sqlite3=${sqlite.dev}" "--with-exuberant-ctags=${ctags}/bin/ctags" "--with-posix-sort=${coreutils}/bin/sort" ]; diff --git a/pkgs/development/tools/misc/patchelf/setup-hook.sh b/pkgs/development/tools/misc/patchelf/setup-hook.sh index 563ef57fce1..bc1cddd4879 100644 --- a/pkgs/development/tools/misc/patchelf/setup-hook.sh +++ b/pkgs/development/tools/misc/patchelf/setup-hook.sh @@ -6,6 +6,8 @@ fixupOutputHooks+=('if [ -z "$dontPatchELF" ]; then patchELF "$prefix"; fi') patchELF() { local dir="$1" + [ -e "$dir" ] || return 0 + header "shrinking RPATHs of ELF executables and libraries in $dir" local i diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 786a7d8cdb5..9c0d81cf004 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1}/include/libusb-1.0"; + cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ python pythonPackages.pyramid_mako orc libusb1 boost ]; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 2284c25cf66..c970b319a94 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/games/0ad/default.nix b/pkgs/games/0ad/default.nix index 485feb53a89..482d2b43df3 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${xproto}/include/X11" - "-I${libX11}/include/X11" - "-I${libXcursor}/include/X11" + "-I${libX11.dev}/include/X11" + "-I${libXcursor.dev}/include/X11" "-I${SDL}/include/SDL" "-I${SDL2}/include/SDL2" ]; 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/games/naev/default.nix b/pkgs/games/naev/default.nix index 580b27ab21d..1f033d49305 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig makeWrapper ]; - NIX_CFLAGS_COMPILE="-include ${zlib}/include/zlib.h"; + NIX_CFLAGS_COMPILE="-include ${zlib.dev}/include/zlib.h"; postInstall = '' mkdir -p $out/share/naev diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index f64f9e38f00..be921bf1189 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sourceRoot = "scorched"; - configureFlags = [ "--with-fftw=${fftwSinglePrec}" ]; + configureFlags = [ "--with-fftw=${fftwSinglePrec.dev}" ]; NIX_LDFLAGS = [ "-lopenal" ]; diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index 7bf277a7f9e..a56afbbf44b 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { gettext intltool libtool perl ]; - configureFlagsArray = ("CFLAGS=-include ${zlib}/include/zlib.h"); + configureFlagsArray = ("CFLAGS=-include ${zlib.dev}/include/zlib.h"); patches = [ ./gcc-fix.patch ]; diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.15.9.nix index 1162cc4f00d..5c989594b3b 100644 --- a/pkgs/misc/drivers/hplip/3.15.9.nix +++ b/pkgs/misc/drivers/hplip/3.15.9.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { find . -type f -exec sed -i \ -e s,/etc/hp,$out/etc/hp, \ -e s,/etc/sane.d,$out/etc/sane.d, \ - -e s,/usr/include/libusb-1.0,${libusb1}/include/libusb-1.0, \ + -e s,/usr/include/libusb-1.0,${libusb1.dev}/include/libusb-1.0, \ -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, \ -e s,/usr/lib/systemd/system,$out/lib/systemd/system, \ -e s,/var/lib/hp,$out/var/lib/hp, \ diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index d90bb66410c..32997f98b21 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { find . -type f -exec sed -i \ -e s,/etc/hp,$out/etc/hp, \ -e s,/etc/sane.d,$out/etc/sane.d, \ - -e s,/usr/include/libusb-1.0,${libusb1}/include/libusb-1.0, \ + -e s,/usr/include/libusb-1.0,${libusb1.dev}/include/libusb-1.0, \ -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, \ -e s,/usr/lib/systemd/system,$out/lib/systemd/system, \ -e s,/var/lib/hp,$out/var/lib/hp, \ diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index f264b311dad..749573f474a 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cmakeFlags = '' -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include - -DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0 + -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 -DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=True ''; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 2a9d923f3e8..0eaf08c2b8d 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cmakeFlags = '' -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include - -DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0 + -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 -DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=True ''; diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index e6a7b9800d3..1b95bca643c 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { -DGLSL_SHADER_DIR="$out/share/pcsx2" \ -DGTK2_GLIBCONFIG_INCLUDE_DIR='${glib.out}/lib/glib-2.0/include' \ -DGTK2_GDKCONFIG_INCLUDE_DIR='${gtk2.out}/lib/gtk-2.0/include' \ - -DGTK2_INCLUDE_DIRS='${gtk2}/include/gtk-2.0' \ + -DGTK2_INCLUDE_DIRS='${gtk2.dev}/include/gtk-2.0' \ -DPACKAGE_MODE=TRUE \ -DPLUGIN_DIR="$out/lib/pcsx2" \ -DREBUILD_SHADER=TRUE \ diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index 0366b9dd22c..aec498b899e 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { configurePhase = '' tar xf ${mupen64plus.src} APIDIR=$(eval echo `pwd`/mupen64plus*/source/mupen64plus-core/src/api) - export CXXFLAGS="-I${libX11}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\"" + export CXXFLAGS="-I${libX11.dev}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\"" export LDFLAGS="-lwx_gtk2u_adv-2.9" python waf configure --mupenapi=$APIDIR --wxconfig=`type -P wx-config` --prefix=$out ''; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 3d51a900c3b..1242d99398f 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { rm -rf jpeg libpng zlib jasper expat tiff lcms{,2} jbig2dec freetype cups/libs ijs sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@; s@INCLUDE=/usr/include@INCLUDE=/no-such-path@" -i base/unix-aux.mak - sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib}/include@" -i configure.ac + sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib.dev}/include@" -i configure.ac autoconf '' + lib.optionalString cupsSupport '' diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 606a4200d0e..73b987baeb0 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig mesa xlibsWrapper imagemagick libtiff bzip2 ]; - NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick"; + NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; meta = { 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 42adab1c887..1c9b5879e6e 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/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index d671c7c7230..8014881860b 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ln -sf "${cctools}/bin/$i" "$out/bin/$i" done - for i in ${binutils-raw}/include/*.h; do + for i in ${binutils-raw.dev}/include/*.h; do ln -s "$i" "$out/include/$(basename $i)" done diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index a71cfa2267e..2b907bde10a 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -262,7 +262,7 @@ if test -z "$libsOnly"; then # a symlink named libfglrx_gamma.so.1 linking to libfglrx_gamma.so.1.0 in $out/lib/ cd programs/fglrx_gamma - gcc -fPIC -I${libXxf86vm}/include \ + gcc -fPIC -I${libXxf86vm.dev}/include \ -I${xf86vidmodeproto}/include \ -I$out/X11R6/include \ -L$out/lib \ diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 0d06864df1e..630c4985325 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" substituteInPlace ./Documentation/Makefile --replace "--skip-validation" "--skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" - substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl}/include/libnl3" + substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3" substituteInPlace ./Makefile --replace "tar-name := $(shell git tag -l v$(CRIU_VERSION))" "tar-name = 2.0" # --replace "-Werror" "" ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ''; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 0edd2d6e0f4..a3e9e930f5e 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { cat -n .config substituteInPlace Makefile --replace /usr/local $out export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \ - -I$(echo "${libnl}"/include/libnl*/) \ + -I$(echo "${libnl.dev}"/include/libnl*/) \ -I${pcsclite}/include/PCSC/" ''; diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index 7abf6d7c828..8b10136309c 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -10,6 +10,8 @@ , libpciaccess }: +assert stdenv.isLinux; + stdenv.mkDerivation { name = "xf86-input-multitouch-20110312"; @@ -31,7 +33,7 @@ stdenv.mkDerivation { buildInputs = [ mtdev xproto xextproto inputproto libpciaccess randrproto ]; buildPhase = '' - make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorgserver}/include/xorg -I${pixman}/include/pixman-1 -Iinclude" + make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorgserver.dev}/include/xorg -I${pixman}/include/pixman-1 -Iinclude" ''; installPhase = '' diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 6df27eaf328..04eccf0c5d7 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-munge=${munge}" - "--with-ssl=${openssl}" + "--with-ssl=${openssl.dev}" ] ++ stdenv.lib.optional (gtk == null) "--disable-gtktest"; preConfigure = '' diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 5fbb02da73e..bb0928fa1ee 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--with-libtool" "--with-libxml2=${libxml2}" - "--with-openssl=${openssl}" + "--with-openssl=${openssl.dev}" "--without-atf" "--without-dlopen" "--without-docbook-xsl" diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index 361aa3d58f7..0bde9baa4bf 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { configureFlags="$configureFlags --includedir=$dev/include" ''; configureFlags = '' - --with-z=${zlib} - --with-pcre=${pcre} + --with-z=${zlib.dev} + --with-pcre=${pcre.dev} --enable-mods-shared=all --enable-authn-alias ${if proxySupport then "--enable-proxy" else ""} - ${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""} + ${if sslSupport then "--enable-ssl --with-ssl=${openssl.dev}" else ""} ${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""} --with-mpm=${mpm} --enable-cache diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index bc7fd1441c1..d52973ea12f 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -46,10 +46,10 @@ stdenv.mkDerivation rec { configureFlags="$configureFlags --includedir=$dev/include" ''; configureFlags = '' - --with-apr=${apr} - --with-apr-util=${aprutil} - --with-z=${zlib} - --with-pcre=${pcre} + --with-apr=${apr.dev} + --with-apr-util=${aprutil.dev} + --with-z=${zlib.dev} + --with-pcre=${pcre.dev} --disable-maintainer-mode --disable-debugger-mode --enable-mods-shared=all diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 90d0fb899c3..dee2fb3e4ff 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc"; }; - configureFlags = "--with-apxs=${apacheHttpd}/bin/apxs --with-java-home=${jdk}"; + configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}"; sourceRoot = "${name}-src/native"; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f58479e4478..888efc006d0 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -55,7 +55,7 @@ src = "${pkgs.modsecurity_standalone.nginx}/nginx/modsecurity"; inputs = [ pkgs.curl pkgs.apr pkgs.aprutil pkgs.apacheHttpd pkgs.yajl ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.aprutil}/include/apr-1 -I${pkgs.apacheHttpd}/include -I${pkgs.apr}/include/apr-1 -I${pkgs.yajl}/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.aprutil.dev}/include/apr-1 -I${pkgs.apacheHttpd.dev}/include -I${pkgs.apr.dev}/include/apr-1 -I${pkgs.yajl}/include" ''; }; diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index c8368fa9524..df4250c81fa 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-epoll" "--enable-ipv6" - "--enable-openssl=${openssl}" + "--enable-openssl=${openssl.dev}" "--with-program-prefix=charybdis-" ]; diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index 512cee4b016..603c765854f 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ openssl zlib ]; configureFlags = - "--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl}"; + "--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl.dev}"; postInstall = "echo postinstall; mkdir -p \${out}/ ; rm -rf \${out}/logs ; ln -s /home/ircd \${out}/logs;"; diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 95dc5ab8679..39667c8ba62 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--with-openldap" "--with-db=${db}" - "--with-sasl=${cyrus_sasl}" + "--with-sasl=${cyrus_sasl.dev}" "--with-netsnmp=${net_snmp}" ]; diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 0123d19bf3f..cf93b11ba9a 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--with-privsep-user=smtpd" - "--with-libevent-dir=${libevent}" + "--with-libevent-dir=${libevent.dev}" "--with-filter-clamav" "--with-filter-dkim-signer" diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 75685d7605e..d75e2e05935 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -7,7 +7,7 @@ let ccargs = lib.concatStringsSep " " ([ - "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl}/include/sasl" + "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl" "-DHAS_DB_BYPASS_MAKEDEFS_CHECK" "-fPIE" "-fstack-protector-all" "--param" "ssp-buffer-size=4" "-O2" "-D_FORTIFY_SOURCE=2" ] ++ lib.optional withPgSQL "-DHAS_PGSQL" diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 816ac1bdb25..6da7d8cf85b 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--with-sys-contact=root@unknown" "--with-logfile=/var/log/net-snmpd.log" "--with-persistent-directory=/var/lib/net-snmp" - "--with-openssl=${openssl}" + "--with-openssl=${openssl.dev}" ] ++ stdenv.lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts"; buildInputs = [ autoreconfHook file perl unzip openssl ]; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index 139786ba59d..2ebc8026484 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -46,8 +46,8 @@ in ] ++ stdenv.lib.optional enableJabber "--with-jabber=${minmay}" ++ stdenv.lib.optional enableSnmp "--with-net-snmp" - ++ stdenv.lib.optional enableSsh "--with-ssh2=${libssh2}" - ++ stdenv.lib.optional enableLdap "--with-ldap=${openldap}"; + ++ stdenv.lib.optional enableSsh "--with-ssh2=${libssh2.dev}" + ++ stdenv.lib.optional enableLdap "--with-ldap=${openldap.dev}"; postPatch = '' sed -i -e 's/iksemel/minmay/g' configure src/libs/zbxmedia/jabber.c diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 12ed3f56d9f..777ad9407c7 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -51,7 +51,7 @@ buildPerlPackage { preConfigure = '' substituteInPlace core/server/Makefile.PL \ - --replace "my \$openssl_inc_dir = ''';" "my \$openssl_inc_dir = '${openssl}/include';" \ + --replace "my \$openssl_inc_dir = ''';" "my \$openssl_inc_dir = '${openssl.dev}/include';" \ --replace "my \$openssl_lib_dir = ''';" "my \$openssl_lib_dir = '${openssl.out}/lib';" \ --replace "my \$openssl_binary = ''';" "my \$openssl_binary = '${openssl.bin}/bin/openssl';" substituteInPlace tools/vergen --replace "#!/usr/bin/perl" "#!${perl}/bin/perl" diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix index caf6149e62c..017c99b01d0 100644 --- a/pkgs/servers/sql/mysql/5.1.x.nix +++ b/pkgs/servers/sql/mysql/5.1.x.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-thread-safe-client" - "--with-ssl=${openssl}" + "--with-ssl=${openssl.dev}" "--with-embedded-server" "--with-plugins=max-no-ndb" "--with-unix-socket-path=/run/mysqld/mysqld.sock" diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 4de0ace0c03..aba8efa0798 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -13,9 +13,9 @@ 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} + --enable-openssl=${openssl.dev} "; postInstall='' diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index de610f9a729..192bdc9dcb1 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -13,9 +13,9 @@ 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} + --enable-openssl=${openssl.dev} "; postInstall='' diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 7f17e2632a7..16fa2423a11 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -601,11 +601,11 @@ let }) // {inherit xproto ;}; inputproto = (mkDerivation "inputproto" { - name = "inputproto-2.3.1"; + name = "inputproto-2.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2; - sha256 = "1lf1jlxp0fc8h6fjdffhd084dqab94966l1zm3rwwsis0mifwiss"; + url = mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2; + sha256 = "07gk7v006zqn3dcfh16l06gnccy7xnqywf3vl9c209ikazsnlfl9"; }; buildInputs = [pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; @@ -806,6 +806,7 @@ let sha256 = "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9"; }; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; + meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; libXft = (mkDerivation "libXft" { @@ -1040,11 +1041,11 @@ let }) // {inherit ;}; libxcb = (mkDerivation "libxcb" { - name = "libxcb-1.11.1"; + name = "libxcb-1.12"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.11.1.tar.bz2; - sha256 = "0c4xyvdyx5adh8dzyhnrmvwwz24gri4z1czxmxqm63i0gmngs85p"; + url = http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2; + sha256 = "0nvv0la91cf8p5qqlb3r5xnmg1jn2wphn4fb5jfbr6byqsvv3psa"; }; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1260,11 +1261,11 @@ let }) // {inherit ;}; videoproto = (mkDerivation "videoproto" { - name = "videoproto-2.3.2"; + name = "videoproto-2.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/videoproto-2.3.2.tar.bz2; - sha256 = "1dnlkd9nb0m135lgd6hd61vc29sdyarsyya8aqpx7z10p261dbld"; + url = mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2; + sha256 = "00m7rh3pwmsld4d5fpii3xfk5ciqn17kkk38gfpzrrh8zn4ki067"; }; buildInputs = [pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1326,11 +1327,11 @@ let }) // {inherit ;}; xcbproto = (mkDerivation "xcbproto" { - name = "xcb-proto-1.11"; + name = "xcb-proto-1.12"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2; - sha256 = "0bp3f53l9fy5x3mn1rkj1g81aiyzl90wacwvqdgy831aa3kfxb5l"; + url = http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2; + sha256 = "01j91946q8f34l1mbvmmgvyc393sm28ym4lxlacpiav4qsjan8jr"; }; buildInputs = [pkgconfig python ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1348,11 +1349,11 @@ let }) // {inherit gperf m4 libxcb xproto ;}; xcbutilcursor = (mkDerivation "xcbutilcursor" { - name = "xcb-util-cursor-0.1.2"; + name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.2.tar.bz2; - sha256 = "0fpv46zb7kz04qxwvpax4cpd2kd8yhsm2n0if1isniqdh5xkcrgd"; + url = http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2; + sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; buildInputs = [pkgconfig gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1579,11 +1580,11 @@ let }) // {inherit ;}; xf86inputevdev = (mkDerivation "xf86inputevdev" { - name = "xf86-input-evdev-2.10.1"; + name = "xf86-input-evdev-2.10.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.1.tar.bz2; - sha256 = "05z05n39v8s2b0hwhcjb1bca7j8gc62bv9jxnibawwmjym3jp75g"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.2.tar.bz2; + sha256 = "07gybpiv33rymcq5l729agan7nzv5f97wdczja6p145b846n6fm7"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1612,11 +1613,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.16.0"; + name = "xf86-input-libinput-0.19.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.16.0.tar.bz2; - sha256 = "0jbgnxsbr3g4g9vkspcc6pqy7av59zx5bb78vkvaqy8yx4qybbgx"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.0.tar.bz2; + sha256 = "0xzl3aiah9vma3pvi170g1847vxqrg4is3ilc51f72lbgkf30pbc"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1700,11 +1701,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.6.1"; + name = "xf86-video-ati-7.7.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.6.1.tar.bz2; - sha256 = "0k6kw69mcarlmxlb4jlhz887jxqr94qx2pin04xcv2ysp3pdj5i5"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2; + sha256 = "1hy1n8an98mflfbdcb3q7wv59x971j7nf9zhivf90p0lgdbiqkc4"; }; buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1927,6 +1928,7 @@ let sha256 = "1a7rqafxzc2hd0s5pnq8s8j9d3jg64ndc0xnq4160kasyqhwy3k6"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videos3virge = (mkDerivation "xf86videos3virge" { @@ -2396,22 +2398,22 @@ let }) // {inherit libX11 xproto ;}; xproto = (mkDerivation "xproto" { - name = "xproto-7.0.28"; + name = "xproto-7.0.29"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/xproto-7.0.28.tar.bz2; - sha256 = "1jpnvm33vi2dar5y5zgz7jjh0m8fpkcxm0f0lbwfx37ns5l5bs19"; + url = mirror://xorg/individual/proto/xproto-7.0.29.tar.bz2; + sha256 = "12lzpa9mrzkyrhrphzpi1014np3328qg7mdq08wj6wyaj9q4f6kc"; }; buildInputs = [pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; xrandr = (mkDerivation "xrandr" { - name = "xrandr-1.4.3"; + name = "xrandr-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrandr-1.4.3.tar.bz2; - sha256 = "06xy0kr6ih7ilrwl6b5g6ay75vm2j4lxnv1d5xlj6sdqhqsaqm3i"; + url = mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2; + sha256 = "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1"; }; buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index fc3068b8f35..56a7b1f76a9 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,8 +1,8 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.11.1.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2 +http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.2.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a19f479bf2e..74d95259163 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -305,6 +305,7 @@ in }; xf86inputsynaptics = attrs: attrs // { + outputs = [ "dev" "out" ]; # *.pc pulls xorgserver.dev buildInputs = attrs.buildInputs ++ [args.mtdev args.libevdev]; installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d"; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 6110b1b571a..2ebf31918b8 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -48,7 +48,7 @@ mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2 mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2 -mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2 +mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2 mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 @@ -101,7 +101,7 @@ mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 mirror://xorg/individual/app/twm-1.0.9.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2 -mirror://xorg/individual/proto/videoproto-2.3.2.tar.bz2 +mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 mirror://xorg/individual/app/xauth-1.0.9.tar.bz2 @@ -119,17 +119,17 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.10.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.10.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.16.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.19.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.6.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2 mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 @@ -187,8 +187,8 @@ mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 -mirror://xorg/individual/proto/xproto-7.0.28.tar.bz2 -mirror://xorg/individual/app/xrandr-1.4.3.tar.bz2 +mirror://xorg/individual/proto/xproto-7.0.29.tar.bz2 +mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 mirror://xorg/individual/app/xset-1.2.3.tar.bz2 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/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 36d3ebd9816..16660fea3e7 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "gnutar-${version}"; - version = "1.28"; + version = "1.29"; src = fetchurl { - url = "mirror://gnu/tar/tar-${version}.tar.bz2"; - sha256 = "0qkm2k9w8z91hwj8rffpjj9v1vhpiriwz4cdj36k9vrgc3hbzr30"; + url = "mirror://gnu/tar/tar-${version}.tar.xz"; + sha256 = "097hx7sbzp8qirl4m930lw84kn0wmxhmq7v1qpra3mrg0b8cyba0"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./gnutar-1.28-darwin.patch; + patches = [ ]; # FIXME: remove on another stdenv rebuild # avoid retaining reference to CF during stdenv bootstrap configureFlags = stdenv.lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/archivers/gnutar/gnutar-1.28-darwin.patch b/pkgs/tools/archivers/gnutar/gnutar-1.28-darwin.patch deleted file mode 100644 index cab0e4406d8..00000000000 --- a/pkgs/tools/archivers/gnutar/gnutar-1.28-darwin.patch +++ /dev/null @@ -1,114 +0,0 @@ ->From 7d1d3d38cb66b02c062de77847e3c0ecd842366c Mon Sep 17 00:00:00 2001 -From: Pavel Raiskup <address@hidden> -Date: Mon, 4 Aug 2014 13:19:49 +0200 -Subject: [PATCH] xattrs: fix bug in configure - -Be careful to define HAVE_XATTRS when not all needed xattr-related -functions are properly defined either in libc or libattr. - -Reported independently by Denis Excoffier and Dominyk Tille. - -* acinclude.m4 (TAR_HEADERS_ATTR_XATTR_H): Check for each xattr -function separately. Don't AC_CHECK_LIB (LIBS is filled by -AC_SEARCH_LIBS when necessary). -* lib/xattr-at.c: Do not build when HAVE_XATTRS is not defined. -* src/Makefile.am: The LDADD -lattr was redundant. ---- - acinclude.m4 | 42 ++++++++++++++---------------------------- - lib/xattr-at.c | 7 +++++++ - src/Makefile.am | 4 ---- - 3 files changed, 21 insertions(+), 32 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 3b28b3b..db0bbc7 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -40,37 +40,23 @@ AC_DEFUN([TAR_HEADERS_ATTR_XATTR_H], - # First check for <sys/xattr.h> - AC_CHECK_HEADERS([sys/xattr.h]) - AM_CONDITIONAL([TAR_COND_XATTR_H],[test "$ac_cv_header_sys_xattr_h" = yes]) -- AM_CONDITIONAL([TAR_LIB_ATTR],[false]) -- if test "$ac_cv_header_sys_xattr_h" = yes; then -- AC_CHECK_FUNCS(getxattr fgetxattr lgetxattr \ -- setxattr fsetxattr lsetxattr \ -- listxattr flistxattr llistxattr, -- # only when functions are present -- AC_DEFINE([HAVE_SYS_XATTR_H], [1], -- [define to 1 if we have <sys/xattr.h> header]) -- if test "$with_xattrs" != no; then -- AC_DEFINE([HAVE_XATTRS],,[Define when we have working linux xattrs.]) -- fi -- ) -- fi -- -- # If <sys/xattr.h> is not found, then check for <attr/xattr.h> - if test "$ac_cv_header_sys_xattr_h" != yes; then - AC_CHECK_HEADERS([attr/xattr.h]) - AM_CONDITIONAL([TAR_COND_XATTR_H],[test "$ac_cv_header_attr_xattr_h" = yes]) -- AC_CHECK_LIB([attr],[fgetxattr]) -- AM_CONDITIONAL([TAR_LIB_ATTR],[test "$ac_cv_lib_attr_fgetxattr" = yes]) -- if test "$ac_cv_header_attr_xattr_h" = yes; then -- AC_CHECK_FUNCS(getxattr fgetxattr lgetxattr \ -- setxattr fsetxattr lsetxattr \ -- listxattr flistxattr llistxattr, -- # only when functions are present -- AC_DEFINE([HAVE_ATTR_XATTR_H], [1], -- [define to 1 if we have <attr/xattr.h> header]) -- if test "$with_xattrs" != no; then -- AC_DEFINE([HAVE_XATTRS],,[Define when we have working linux xattrs.]) -- fi -- ) -+ fi -+ -+ if test "$with_xattrs" != no; then -+ for i in getxattr fgetxattr lgetxattr \ -+ setxattr fsetxattr lsetxattr \ -+ listxattr flistxattr llistxattr -+ do -+ AC_SEARCH_LIBS($i, attr) -+ eval found=\$ac_cv_search_$i -+ test "$found" = "no" && break -+ done -+ -+ if test "$found" != no; then -+ AC_DEFINE([HAVE_XATTRS],,[Define when we have working linux xattrs.]) - fi - fi - ]) -diff --git a/lib/xattr-at.c b/lib/xattr-at.c -index 443ccae..009bde5 100644 ---- a/lib/xattr-at.c -+++ b/lib/xattr-at.c -@@ -18,6 +18,11 @@ - - #include <config.h> - -+/* Temporarily don't build. We are unable to build on (probably not only) -+ darwin due to lack of l*xattr callbacks (XATTR_NOFOLLOW is alternative) and -+ different function definitions. */ -+#ifdef HAVE_XATTRS -+ - #include "xattr-at.h" - #include "openat.h" - -@@ -108,3 +113,5 @@ - #undef AT_FUNC_RESULT - #undef AT_FUNC_POST_FILE_PARAM_DECLS - #undef AT_FUNC_POST_FILE_ARGS -+ -+#endif -diff --git a/src/Makefile.am b/src/Makefile.am -index 82b2d46..42daaef 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -52,7 +52,3 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) - LDADD = ../lib/libtar.a ../gnu/libgnu.a $(LIBINTL) $(LIBICONV) - - tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX) -- --if TAR_LIB_ATTR --tar_LDADD += -lattr --endif --- -1.9.3 - diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index 4f659428c00..a639dbb2fd2 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { [ cython msgpack openssl acl llfuse ]; preConfigure = '' - export ATTIC_OPENSSL_PREFIX="${openssl}" + export ATTIC_OPENSSL_PREFIX="${openssl.dev}" substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='${version}'" ''; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 8d586e5cb1f..374122814c5 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 5a7c35e460f..cf44d0e9c26 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -50,13 +50,13 @@ 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}" - ++ optional (sqlite != null) "--with-sqlite3=${sqlite}" + ++ optional (openssl != null) "--with-openssl=${openssl.dev}" + ++ 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}" + ++ optional (zlib != null) "--with-zlib=${zlib.dev}" ++ optional (lzo != null) "--with-lzo=${lzo}" ++ optional (jansson != null) "--with-jansson=${jansson}" ++ optional (acl != null) "--enable-acl" diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 8ebdbfd4ffb..a43a678cd7a 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { ]); preConfigure = '' - export BORG_OPENSSL_PREFIX="${openssl}" + export BORG_OPENSSL_PREFIX="${openssl.dev}" export BORG_LZ4_PREFIX="${lz4}" ''; diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index 37d99a115f8..e73e71da51a 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { url = mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2; sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm"; }; - configureFlags = "--with-ssl-headers=${openssl}/include/openssl"; + configureFlags = "--with-ssl-headers=${openssl.dev}/include/openssl"; buildInputs = [bzip2 zlib newt newt openssl pkgconfig slang # automake autoconf libtool gettext diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 7e4ea032bb3..e3c608285fc 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec{ configureFlags = [ "--with-bdb=${db}" - "--with-openssl=${openssl}" + "--with-openssl=${openssl.dev}" "--with-lockfile=/run/lock/netatalk" "--localstatedir=/var/lib" ]; diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index bbd4b185d5e..fb491948a47 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { export BOOST_INCLUDEDIR=${boost.dev}/include export BOOST_LIBRARYDIR=${boost.out}/lib - export OPENSSL_ROOT_DIR=${openssl} + export OPENSSL_ROOT_DIR=${openssl.dev} substituteInPlace cpp/cmake/FindValgrind.cmake \ --replace "/usr/local" "${valgrind}" diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 971a7e973cc..7d191ccaba5 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { configureFlags="$configureFlags --with-latex=$out/share/texmf/tex/latex --with-context=$out/share/texmf/tex/context/third" ''; - NIX_CFLAGS_COMPILE = [ "-I${boehmgc}/include/gc" ]; + NIX_CFLAGS_COMPILE = [ "-I${boehmgc.dev}/include/gc" ]; postInstall = '' mv -v "$out/share/info/asymptote/"*.info $out/share/info/ diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 02b700111de..0a11c3c8b28 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -15,11 +15,11 @@ 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}/include" + "--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpeglibdir=${libjpeg.out}/lib" - "--with-expatincludedir=${expat}/include" + "--with-expatincludedir=${expat.dev}/include" "--with-expatlibdir=${expat.out}/lib" ] ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x"; diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 8a720562167..695ac898fe8 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -20,11 +20,11 @@ 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}/include" + "--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpeglibdir=${libjpeg.out}/lib" - "--with-expatincludedir=${expat}/include" + "--with-expatincludedir=${expat.dev}/include" "--with-expatlibdir=${expat.out}/lib" "--with-cgraph=no" "--with-sparse=no" diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 4a52434d379..bebf7680ded 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { echo "STATICLIB_TOO = n" >> config.mk substituteInPlace "config.mk" \ --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \ - --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include" + --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include" ''; preBuild = '' diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index f84ccce4eb9..09018108d89 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation { ''; enableParallelBuilding = true; cmakeFlags = [ - "-DQt5Widgets_DIR=${qt5.qtbase}/lib/cmake/Qt5Widgets" - "-DQt5Gui_DIR=${qt5.qtbase}/lib/cmake/Qt5Gui" - "-DQt5Core_DIR=${qt5.qtbase}/lib/cmake/Qt5Core" + "-DQt5Widgets_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Widgets" + "-DQt5Gui_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Gui" + "-DQt5Core_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Core" "-DBUILD_TYPE=Release" ]; diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix index bf868790de2..41aaad55346 100644 --- a/pkgs/tools/misc/kde-gtk-config/default.nix +++ b/pkgs/tools/misc/kde-gtk-config/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { cmakeFlags = '' -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include - -DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0 + -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 -DKDE4_LIBEXEC_INSTALL_DIR=lib/kde4/libexec ''; diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index b97d8f0b719..1c1def9b8a8 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { -e "s|/bin/rm|rm|" ''; - configureFlags = "--with-slang=${slang}"; + configureFlags = "--with-slang=${slang.dev}"; buildInputs = [ slang ncurses ]; diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 3501090c63c..2f69517e4bd 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1yjpi2qshnqfpan4w3ggakkr3znfrx5cxkny92ka7v9na3g2fc4h"; }; - makeFlags = [ "LIBUSB=${libusb}" "linux" ]; + makeFlags = [ "LIBUSB=${libusb.dev}" "linux" ]; installPhase = '' mkdir -p $out/bin $out/share/pk2 diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index 5a03e099539..da0c966eb5e 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`" ''; diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix index 56046d5423d..c3c16cc08b4 100644 --- a/pkgs/tools/networking/curl/7.15.nix +++ b/pkgs/tools/networking/curl/7.15.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" - ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) - ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) + ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) + ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" ) ] ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}" diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 47f03cc3747..f2e6117966f 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" "--disable-manual" - ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) - ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) + ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) + ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" ) ( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" ) - ( if idnSupport then "--with-libidn=${libidn}" else "--without-libidn" ) + ( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" ) ] ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}"; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index bc0085a731e..1d0c9d55076 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; # It doesn't know about the include/libnl<n> directory - NIX_CFLAGS_COMPILE="-I${libnl}/include/libnl3"; + NIX_CFLAGS_COMPILE="-I${libnl.dev}/include/libnl3"; NIX_LDFLAGS="-lnl-3 -lnl-genl-3"; configureFlags = [ diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/tools/networking/mailsend/default.nix index dcb7d96c756..6f555278219 100644 --- a/pkgs/tools/networking/mailsend/default.nix +++ b/pkgs/tools/networking/mailsend/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { inherit (s) url sha256; }; configureFlags = [ - "--with-openssl=${openssl}" + "--with-openssl=${openssl.dev}" ]; meta = { inherit (s) version; diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index ed28db45f10..6dbd6267993 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-openssl=${openssl}" + "--with-openssl=${openssl.dev}" "--with-runtime-dir=/run/sstpc" "--with-pppd-plugin-dir=$(out)/lib/pppd" ]; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index e8b56ed7d96..96169ab294c 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; configureFlags = [ - "--with-ssl=${openssl}" + "--with-ssl=${openssl.dev}" "--sysconfdir=/etc" "--localstatedir=/var" ]; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index f639044a195..684b9b13a80 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ssl=${openssl.dev}" - "--with-libexpat=${expat}" + "--with-libexpat=${expat.dev}" "--with-libevent=${libevent.dev}" "--localstatedir=/var" "--sysconfdir=/etc" diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index e2c83bcb975..9d4ae5d671a 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { ++ stdenv.lib.optional (!stdenv.isDarwin) pam; patchPhase = '' - sed -i src/osdep/unix/Makefile -e 's,/usr/local/ssl,${openssl},' + sed -i src/osdep/unix/Makefile -e 's,/usr/local/ssl,${openssl.dev},' sed -i src/osdep/unix/Makefile -e 's,^SSLCERTS=.*,SSLCERTS=/etc/ssl/certs,' sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${openssl.out}/lib,' ''; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin - "-I${openssl}/include/openssl"; + "-I${openssl.dev}/include/openssl"; installPhase = '' mkdir -p $out/bin $out/lib $out/include diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index e14326fe9e6..b0397149e60 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { configureFlags = '' --with-lzo-headers=${lzo}/include/lzo - --with-ssl-headers=${openssl}/include/openssl - --with-blowfish-headers=${openssl}/include/openssl''; + --with-ssl-headers=${openssl.dev}/include/openssl + --with-blowfish-headers=${openssl.dev}/include/openssl''; meta = with stdenv.lib; { description = "Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption"; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index bebb8a95a58..e62cce9e4e3 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ]; configureFlags = [ - "--with-zlib=${zlib}" - "--with-libbz2-prefix=${bzip2}" + "--with-zlib=${zlib.dev}" + "--with-libbz2-prefix=${bzip2.dev}" "--with-iconv-dir=${libiconv}" "--with-xml=${libxml2}" - "--with-openssl=${openssl}" - "--with-libncurses-prefix=${ncurses}" - "--with-libcurl=${curl}" - "--with-pcre=${pcre}" + "--with-openssl=${openssl.dev}" + "--with-libncurses-prefix=${ncurses.dev}" + "--with-libcurl=${curl.dev}" + "--with-pcre=${pcre.dev}" "--enable-milter" "--disable-clamav" ]; diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index a3aa417a4ea..af5e72faca4 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { [ "--with-pam=$(out)/lib/security" "--prefix=$(out)" "--sysconfdir=$(out)/etc/duo" - "--with-openssl=${openssl}" + "--with-openssl=${openssl.dev}" "--enable-lib64=no" ]; diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 09754f53a9e..0b6900fb214 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-standalone-module" "--enable-static" - "--with-curl=${curl}" - "--with-apxs=${apacheHttpd}/bin/apxs" - "--with-pcre=${pcre}" - "--with-apr=${apr}" - "--with-apu=${aprutil}/bin/apu-1-config" + "--with-curl=${curl.dev}" + "--with-apxs=${apacheHttpd.dev}/bin/apxs" + "--with-pcre=${pcre.dev}" + "--with-apr=${apr.dev}" + "--with-apu=${aprutil.dev}/bin/apu-1-config" "--with-libxml=${libxml2}" ]; diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix index 656bb4aede0..bf1197c2bf2 100644 --- a/pkgs/tools/security/prey/default.nix +++ b/pkgs/tools/security/prey/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { cp -R . $out cp -R ${modulesSrc}/* $out/modules/ wrapProgram "$out/prey.sh" \ - --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl.bin}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \ + --prefix PATH ":" "${xawtv}/bin:${imagemagick.out}/bin:${curl.bin}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \ --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt" ''; diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 0ee32a49c07..66a2703932d 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals usePAM [ pam ]; configureFlags = [ - "--with-ssl-incl-dir=${openssl}/include" + "--with-ssl-incl-dir=${openssl.dev}/include" "--with-ssl-lib-dir=${openssl.out}/lib" ] ++ stdenv.lib.optionals (! usePAM) [ "--without-pam" ]; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 8578960b987..c7e0857c2ca 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-*"; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index 74f7e08900a..b390a9c404a 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) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 7c393c52415..e623f67e64b 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -223,7 +223,7 @@ stdenv.mkDerivation rec { sed -e "s|run('abc2ly|run('${lilypond}/bin/abc2ly|g" \ -e "s|run('lilypond|run('${lilypond}/bin/lilypond|g" \ - -e "s|run('convert|run('${imagemagick}/bin/convert|g" \ + -e "s|run('convert|run('${imagemagick.out}/bin/convert|g" \ -i "filters/music/music2png.py" sed -e 's|filter="source-highlight|filter="${sourceHighlight}/bin/source-highlight|' \ diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 0aab900f150..a7bc527042e 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { -e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \ -e 's|cmd = "fig2dev|cmd = "${transfig}/bin/fig2dev|g' \ -e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \ - -e 's|cmd = "convert|cmd = "${imagemagick}/bin/convert|g' \ + -e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \ -i "$file" done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40bbe284311..66782f4a230 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 abd4a812341..980c0aca633 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 e0f2d4ef1fb..db1405ff8a8 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 70006922079..c0248644d5e 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 2406df879b8..098570eb3a4 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 ''; |