diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 3da13dd9ed6..18b2fd65f44 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -740,7 +740,7 @@ to the `stack.yaml` like the following: enable: true packages: [ zlib ] -Stack's Nix support knows to add `${zlib}/lib` and `${zlib}/include` as an +Stack's Nix support knows to add `${zlib.out}/lib` and `${zlib.dev}/include` as an `--extra-lib-dirs` and `extra-include-dirs`, respectively. Alternatively, you can achieve the same effect by hand. First of all, run diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 56a4b526641..9c67dc4ebe6 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -291,8 +291,8 @@ pyfftw = buildPythonPackage rec { # Tests cannot import pyfftw. pyfftw works fine though. doCheck = false; - LDFLAGS="-L${pkgs.fftw}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib" - CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include" + LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib" + CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include" ''; meta = { diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 97d3ec8438f..def9709d1ee 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -129,7 +129,7 @@ ericbmerritt = "Eric Merritt "; ericsagnes = "Eric Sagnes "; erikryb = "Erik Rybakken "; - ertes = "Ertugrul Söylemez "; + ertes = "Ertugrul Söylemez "; exi = "Reno Reckling "; exlevan = "Alexey Levan "; expipiplus1 = "Joe Hermaszewski "; diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 5f463c09284..61b214bfba8 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -29,7 +29,7 @@ rec { cp ${./test-driver/Logger.pm} $libDir/Logger.pm wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin" \ + --prefix PATH : "${lib.makeBinPath [ qemu_kvm vde2 netpbm coreutils ]}" \ --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" ''; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 33163d9789b..39283d2d943 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -121,7 +121,7 @@ let makeWrapper ${cfg.packages.gitlab.env}/bin/bundle $out/bin/gitlab-bundle \ ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \ --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \ - --set PATH '${pkgs.nodejs}/bin:${pkgs.gzip}/bin:${config.services.postgresql.package}/bin:$PATH' \ + --set PATH '${stdenv.lib.makeBinPath [ pkgs.nodejs pkgs.gzip config.services.postgresql.package ]}:$PATH' \ --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \ --run 'cd ${cfg.packages.gitlab}/share/gitlab' makeWrapper $out/bin/gitlab-bundle $out/bin/gitlab-rake \ diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index d71837737ab..fe5132d4973 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -248,7 +248,7 @@ in description = '' List of binary cache URLs that non-root users can use (in addition to those specified using - by passing + ) by passing --option binary-caches to Nix commands. ''; }; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 8ef684932ac..08fc3f04dbf 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -465,7 +465,7 @@ in { DJANGO_SETTINGS_MODULE = "graphite.settings"; GRAPHITE_CONF_DIR = configDir; GRAPHITE_STORAGE_DIR = dataDir; - LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; + LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib"; }; serviceConfig = { ExecStart = '' diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 5154aaca3bc..5b2e4ca1606 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -133,7 +133,7 @@ in @{PROC}/sys/kernel/random/uuid r, @{PROC}/sys/vm/overcommit_memory r, - ${pkgs.openssl}/etc/** r, + ${pkgs.openssl.out}/etc/** r, ${pkgs.transmission}/share/transmission/** r, owner ${settingsDir}/** rw, diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 86b98c2b660..bc010d1ce1c 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -169,7 +169,7 @@ in ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa ++ lib.optional config.powerManagement.enable kde5.powerdevil - ++ lib.optional config.services.colord.enable kde5.colord-kde + ++ lib.optional config.services.colord.enable pkgs.colord-kde ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ]; environment.pathsToLink = [ "/share" ]; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 83d679ebe01..1c928ff22a1 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -134,8 +134,9 @@ let (*) echo "$0: Desktop manager '$desktopManager' not found.";; esac + # FIXME: gdbus should not be in glib.dev! ${optionalString (cfg.startDbusSession && cfg.updateDbusEnvironment) '' - ${pkgs.glib}/bin/gdbus call --session \ + ${pkgs.glib.dev}/bin/gdbus call --session \ --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus \ --method org.freedesktop.DBus.UpdateActivationEnvironment \ "{$(env | ${pkgs.gnused}/bin/sed "s/'/\\\\'/g; s/\([^=]*\)=\(.*\)/'\1':'\2'/" \ diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix index 2957ad91be4..436eccbaf0c 100644 --- a/nixos/modules/services/x11/window-managers/metacity.nix +++ b/nixos/modules/services/x11/window-managers/metacity.nix @@ -20,9 +20,9 @@ in services.xserver.windowManager.session = singleton { name = "metacity"; start = '' - env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext.out}/lib:/usr/lib/ + env LD_LIBRARY_PATH=${lib.makeLibraryPath [ xorg.libX11 xorg.libXext ]}:/usr/lib/ # !!! Hack: load the schemas for Metacity. - GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \ + GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf.out}/bin/gconftool-2 \ --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */ ${gnome.metacity}/bin/metacity & waitPID=$! diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index d0a4ce51148..bc899984c57 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -93,6 +93,10 @@ in boot.initrd.extraUtilsCommands = '' copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib + + ${optionalString (cfg.hostRSAKey != null) "install -D ${cfg.hostRSAKey} $out/etc/dropbear/dropbear_rsa_host_key"} + ${optionalString (cfg.hostDSSKey != null) "install -D ${cfg.hostDSSKey} $out/etc/dropbear/dropbear_dss_host_key"} + ${optionalString (cfg.hostECDSAKey != null) "install -D ${cfg.hostECDSAKey} $out/etc/dropbear/dropbear_ecdsa_host_key"} ''; boot.initrd.extraUtilsCommandsTest = '' @@ -108,9 +112,9 @@ in touch /var/log/lastlog mkdir -p /etc/dropbear - ${optionalString (cfg.hostRSAKey != null) "ln -s ${cfg.hostRSAKey} /etc/dropbear/dropbear_rsa_host_key"} - ${optionalString (cfg.hostDSSKey != null) "ln -s ${cfg.hostDSSKey} /etc/dropbear/dropbear_dss_host_key"} - ${optionalString (cfg.hostECDSAKey != null) "ln -s ${cfg.hostECDSAKey} /etc/dropbear/dropbear_ecdsa_host_key"} + ${optionalString (cfg.hostRSAKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_rsa_host_key /etc/dropbear/dropbear_rsa_host_key"} + ${optionalString (cfg.hostDSSKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_dss_host_key /etc/dropbear/dropbear_dss_host_key"} + ${optionalString (cfg.hostECDSAKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_ecdsa_host_key /etc/dropbear/dropbear_ecdsa_host_key"} mkdir -p /root/.ssh ${concatStrings (map (key: '' diff --git a/nixos/modules/tasks/filesystems/cifs.nix b/nixos/modules/tasks/filesystems/cifs.nix index a928fcae415..47ba0c03c56 100644 --- a/nixos/modules/tasks/filesystems/cifs.nix +++ b/nixos/modules/tasks/filesystems/cifs.nix @@ -11,14 +11,14 @@ in { config = { - system.fsPackages = mkIf (any (fs: fs == "cifs") config.boot.supportedFilesystems) [ pkgs.cifs_utils ]; + system.fsPackages = mkIf (any (fs: fs == "cifs") config.boot.supportedFilesystems) [ pkgs.cifs-utils ]; boot.initrd.availableKernelModules = mkIf inInitrd [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ]; boot.initrd.extraUtilsCommands = mkIf inInitrd '' - copy_bin_and_libs ${pkgs.cifs_utils}/sbin/mount.cifs + copy_bin_and_libs ${pkgs.cifs-utils}/sbin/mount.cifs ''; }; diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix index 456a19fc251..760a7100c6e 100644 --- a/nixos/modules/virtualisation/brightbox-image.nix +++ b/nixos/modules/virtualisation/brightbox-image.nix @@ -20,7 +20,7 @@ in postVM = '' - PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin + PATH=$PATH:${stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]} pushd $out ${pkgs.qemu_kvm}/bin/qemu-img convert -c -O qcow2 $diskImageBase nixos.qcow2 rm $diskImageBase diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 2b522dbe266..59b77dde5d9 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -23,7 +23,7 @@ in postVM = '' - PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin + PATH=$PATH:${stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]} pushd $out mv $diskImageBase disk.raw tar -Szcf $diskImageBase.tar.gz disk.raw diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index e9bc14a6cdb..e85ff238089 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -4,12 +4,12 @@ with import ../lib/testing.nix { inherit system; }; with pkgs.lib; let - testVMConfig = vmName: attrs: { config, pkgs, ... }: let + testVMConfig = vmName: attrs: { config, pkgs, lib, ... }: let guestAdditions = pkgs.linuxPackages.virtualboxGuestAdditions; miniInit = '' #!${pkgs.stdenv.shell} -xe - export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin" + export PATH="${lib.makeBinPath [ pkgs.coreutils pkgs.utillinux ]}" mkdir -p /var/run/dbus cat > /etc/passwd < rather @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk.out}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" # Create desktop item. diff --git a/pkgs/applications/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs-25/default.nix index 56100ae6e63..a8d994012e2 100644 --- a/pkgs/applications/editors/emacs-25/default.nix +++ b/pkgs/applications/editors/emacs-25/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { - name = "emacs-25.1-rc1"; + name = "emacs-25.1-rc2"; builder = ./builder.sh; src = fetchurl { url = "ftp://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.xz"; - sha256 = "0cv1hars9zxlv040h7f3zz50fhn67dqa18ms4hg9sdblckk50360"; + sha256 = "1hffvyvl50mrivdv6lp92sbxi3l2zhblj8npmpbzk47zpl1mzm2v"; }; patches = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix index 170a12d6d69..37066039851 100644 --- a/pkgs/applications/editors/idea/common.nix +++ b/pkgs/applications/editors/idea/common.nix @@ -62,7 +62,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { item=${desktopItem} makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ - --prefix PATH : "$out/libexec/${name}:${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \ + --prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --set JDK_HOME "$jdk" \ --set ${hiName}_JDK "$jdk" \ --set ANDROID_JAVA_HOME "$jdk" \ diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 65ea62b3368..f305db1abb8 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/tuxguitar \ --set JAVA "${jdk}/bin/java" \ - --prefix LD_LIBRARY_PATH : "$out/lib/:${swt}/lib:${alsaLib.out}/lib" \ + --prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt alsaLib ]}" \ --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" ''; diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 363da0d3826..289de0ad91a 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { mkdir -p $out/bin cp -a netbeans $out makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \ - --prefix PATH : ${jdk}/bin:${which}/bin \ + --prefix PATH : ${stdenv.lib.makeBinPath [ jdk which ]} \ --prefix JAVA_HOME : ${jdk.home} \ --add-flags "--jdkhome ${jdk.home}" diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 04119f3f1c6..952d23bbc48 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Allow geeqie to find exiv2 and exiftran, necessary to # losslessly rotate JPEG images. sed -i $out/lib/geeqie/geeqie-rotate \ - -e '1 a export PATH=${exiv2}/bin:${fbida}/bin:$PATH' + -e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH' ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 69e5ccb85ec..a66e9163142 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r linux/work/* $out/${name}/ makeWrapper $out/${name}/processing $out/bin/processing \ - --prefix PATH : "${jdk}/bin:${which}/bin" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib makeWrapper $out/${name}/processing-java $out/bin/processing-java \ - --prefix PATH : "${jdk}/bin:${which}/bin" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib ln -s ${jdk} $out/${name}/java ''; diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index 7e5701395fe..14af2062c61 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; qmakeFlags = [ - "EXIV2PATH=${exiv2}/include/exiv2" + "EXIV2PATH=${exiv2.dev}/include/exiv2" "OPENEXRDIR=${openexr}/include/OpenEXR" "FFTW3DIR=${fftwSinglePrec.dev}/include" "LIBTIFFDIR=${libtiff.dev}/include" diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 8561c2a4ccf..063d0f13faf 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { patchPhase = '' ${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"} - RPATH=${libusb}/lib + RPATH=${libusb.out}/lib for a in usr/lib64/sane/*.so*; do if ! test -L $a; then patchelf --set-rpath $RPATH $a diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 33470ea0c00..4bd80c01c93 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { --replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}" substituteInPlace $out/lib/libsane.la \ - --replace "-ljpeg" "-L${libjpeg}/lib -ljpeg" + --replace "-ljpeg" "-L${libjpeg.out}/lib -ljpeg" '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware); meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index caaa5133c75..e5e09bf71fd 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ln -s $out/{nix-support,bin}/wavesurfer.tcl wrapProgram "$out/nix-support/wavesurfer.tcl" \ --set TCLLIBPATH "${snack}/lib" \ - --prefix PATH : "${tcl}/bin:${tk}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ tcl tk ]}" ''; meta = { diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 1ac74712ff0..0df0a564731 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk mono]}" # We need PATH from user env for xdg-open to find its tools, which # typically depend on the currently running desktop environment. - export PATH="${avrgcclibc}/bin:${avrdude}/bin:${xdg_utils}/bin:\$PATH" + export PATH="${stdenv.lib.makeBinPath [ avrgcclibc avrdude xdg_utils ]}:\$PATH" # avrdudess must have its resource files in its current working directory cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@" diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 3e7ad83c0a1..28ac63f62a9 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew -, ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile +{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew +, ilmbase, libXi, libX11, libjpeg, libpng, libsamplerate, libsndfile , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python -, zlib, fftw, opensubdiv +, zlib, fftw, opensubdiv, freetype , jackaudioSupport ? false, libjack2 , cudaSupport ? false, cudatoolkit , colladaSupport ? true, opencollada @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { }; buildInputs = - [ SDL boost cmake ffmpeg gettext glew ilmbase libXi + [ boost cmake ffmpeg gettext glew ilmbase libXi libX11 freetype libjpeg libpng libsamplerate libsndfile libtiff mesa openal - opencolorio openexr openimageio /* openjpeg */ python zlib fftw + opencolorio openexr openimageio openjpeg python zlib fftw (opensubdiv.override { inherit cudaSupport; }) ] ++ optional jackaudioSupport libjack2 @@ -41,12 +41,15 @@ stdenv.mkDerivation rec { "-DWITH_SDL=ON" "-DWITH_GAMEENGINE=ON" "-DWITH_OPENCOLORIO=ON" + "-DWITH_SYSTEM_OPENJPEG=ON" "-DWITH_PLAYER=ON" "-DWITH_OPENSUBDIV=ON" "-DPYTHON_LIBRARY=python${python.majorVersion}m" "-DPYTHON_LIBPATH=${python}/lib" "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" "-DPYTHON_VERSION=${python.majorVersion}" + "-DWITH_PYTHON_INSTALL=OFF" + "-DWITH_PYTHON_INSTALL_NUMPY=OFF" ] ++ optional jackaudioSupport "-DWITH_JACK=ON" ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON" diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix index 46634e2698c..38cd9dbcc37 100644 --- a/pkgs/applications/misc/ding/default.nix +++ b/pkgs/applications/misc/ding/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { cp ding.png $out/share/pixmaps/ cp ding.desktop $out/share/applications/ - wrapProgram $out/bin/ding --prefix PATH : ${gnugrep}/bin:${aspellEnv}/bin:${tk}/bin:${fortune}/bin --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\"" + wrapProgram $out/bin/ding --prefix PATH : ${stdenv.lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\"" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index f02dbe0fc18..ef5b58733b9 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "emem"; - version = "0.2.26"; + version = "0.2.27"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar"; - sha256 = "1qa3q2zgy20yq060b8gz5h7f5h8kbbk7rgfxvjbxllgd847qs4dy"; + sha256 = "0zmh152dfgsq2yj14wb3504pyibq4r671q5yz6yy28ihym7qr0fd"; }; buildInputs = [ ]; diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index 9d2f8f4a768..1d8412a25f3 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { wrapProgram "$out/bin/finalterm" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with lib; { diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index e5a463bb520..069d07bd82a 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -18,7 +18,7 @@ buildPerlPackage { installPhase = '' mkdir -p $out/bin $out/share/man/man1 cp get_iplayer $out/bin - wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg.bin}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/get_iplayer --suffix PATH : ${stdenv.lib.makeBinPath [ ffmpeg flvstreamer vlc rtmpdump ]} --prefix PERL5LIB : $PERL5LIB cp get_iplayer.1 $out/share/man/man1 ''; diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 04ad52175ff..5b764912f73 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { dontStrip = true; configurePhase = '' - sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I ${freetype}/include+' build.sh + sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I ${freetype.dev}/include+' build.sh sed -i -e 's+-lmupdf +-lfreetype -lz -lharfbuzz -ljbig2dec -lopenjp2 -ljpeg -lmupdf +' build.sh sed -i -e 's+-L\$srcdir/mupdf/build/native ++' build.sh ''; diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 72185848e4a..1358e1f195a 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-libxml2=${libxml2}" - "--with-libxslt=${libxslt}" + "--with-libxslt=${libxslt.dev}" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 10e1315c1f5..853cc517105 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -76,13 +76,13 @@ stdenv.mkDerivation rec { substituteInPlace $out/share/test/TestCommons.awk --replace "\"gawk\"" "\"${gawk}/bin/gawk\"" substituteInPlace $out/share/test/TestCommons.awk --replace "Commons.awk" "$out/share/include/Commons.awk" - substituteInPlace $out/share/include/Main.awk --replace "\"tput\"" "\"${ncurses}/bin/tput\"" + substituteInPlace $out/share/include/Main.awk --replace "\"tput\"" "\"${ncurses.out}/bin/tput\"" substituteInPlace $out/share/include/Help.awk --replace "\"groff\"" "\"${groff}/bin/groff\"" substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi\"" "\"${fribidi}/bin/fribidi\"" substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi " "\"${fribidi}/bin/fribidi " substituteInPlace $out/share/include/Utils.awk --replace "\"rlwrap\"" "\"${rlwrap}/bin/rlwrap\"" substituteInPlace $out/share/include/Utils.awk --replace "\"emacs\"" "\"${emacs}/bin/emacs\"" - substituteInPlace $out/share/include/Utils.awk --replace "\"curl\"" "\"${curl}/bin/curl\"" + substituteInPlace $out/share/include/Utils.awk --replace "\"curl\"" "\"${curl.bin}/bin/curl\"" substituteInPlace $out/share/build.awk --replace "\"pandoc " "\"${pandoc}/bin/pandoc " diff --git a/pkgs/applications/misc/webthree-umbrella/default.nix b/pkgs/applications/misc/webthree-umbrella/default.nix index 3bf3142ad9c..6ada451edf1 100644 --- a/pkgs/applications/misc/webthree-umbrella/default.nix +++ b/pkgs/applications/misc/webthree-umbrella/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ]); configurePhase = '' - export BOOST_INCLUDEDIR=${boost}/include + export BOOST_INCLUDEDIR=${boost.dev}/include export BOOST_LIBRARYDIR=${boost.out}/lib mkdir -p Build/Install diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2c70978a496..a1110fa07a8 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -128,6 +128,7 @@ let patches = [ ./patches/widevine.patch + ./patches/glibc-2.24.patch (if versionOlder version "52.0.0.0" then ./patches/nix_plugin_paths_50.patch else ./patches/nix_plugin_paths_52.patch) diff --git a/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch b/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch new file mode 100644 index 00000000000..10a04b7ec8d --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch @@ -0,0 +1,14 @@ +--- old/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-03 21:02:37.000000000 +0200 ++++ new/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-14 10:59:51.395354850 +0200 +@@ -41,6 +41,11 @@ + #include + #include + ++#if OS(LINUX) && defined(MADV_FREE) ++// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime ++#undef MADV_FREE ++#endif ++ + #ifndef MADV_FREE + #define MADV_FREE MADV_DONTNEED + #endif diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 503c52ac7ba..c9adde4f15b 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -7,6 +7,7 @@ , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ , esteidfirefoxplugin +, vlc_npapi }: ## configurability of the wrapper itself @@ -45,6 +46,7 @@ let ++ lib.optional (cfg.enableBluejeans or false) bluejeans ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin + ++ lib.optional (cfg.enableVLC or false) vlc_npapi ); libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) ++ lib.optionals (cfg.enableQuakeLive or false) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 154a3a9e919..bb7e66a94be 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -41,9 +41,6 @@ buildPythonApplication rec { ''; postInstall = '' - mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath - makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser - install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" install -Dm644 qutebrowser.desktop \ "$out/share/applications/qutebrowser.desktop" @@ -56,6 +53,14 @@ buildPythonApplication rec { install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* ''; + postFixup = '' + wrapPythonPrograms + mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath + makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser + + sed -i 's/\.qutebrowser-wrapped/qutebrowser/g' $out/bin/..qutebrowser-wrapped-wrapped + ''; + meta = { homepage = https://github.com/The-Compiler/qutebrowser; description = "Keyboard-focused browser with a minimal GUI"; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 925fe19d72e..c5cc7ca7431 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { mv * $out for n in $out/{bin,sbin}"/"*; do - wrapProgram $n --prefix PATH : "${which}/bin:${jre}/bin:${bash}/bin" --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "$out" + wrapProgram $n --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash ]}" --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "$out" done ''; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index bc3247c4b3d..75083409ba7 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin" - wrapProgram "$out/bin/kubelet" --prefix PATH : "${utillinux}/bin:${procps-ng}/bin" + wrapProgram "$out/bin/kubelet" --prefix PATH : "${stdenv.lib.makeBinPath [ utillinux procps-ng ]}" chmod +x "$out/libexec/kubernetes/safe_format_and_mount" - wrapProgram "$out/libexec/kubernetes/safe_format_and_mount" --prefix PATH : "${e2fsprogs}/bin:${utillinux}/bin" + wrapProgram "$out/libexec/kubernetes/safe_format_and_mount" --prefix PATH : "${stdenv.lib.makeBinPath [ e2fsprogs utillinux ]}" substituteInPlace "$out"/libexec/kubernetes/cluster/update-storage-objects.sh \ --replace KUBE_OUTPUT_HOSTBIN KUBE_BIN ''; diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix index a5666fc8f32..c99643beb90 100644 --- a/pkgs/applications/networking/cluster/pig/default.nix +++ b/pkgs/applications/networking/cluster/pig/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { for n in $out/{bin,sbin}"/"*; do wrapProgram $n \ - --prefix PATH : "${jre}/bin:${bash}/bin" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ jre bash ]}" \ --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "${hadoop}" done ''; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 2bc1a643db7..d66209a6d20 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.7.0"; + version = "0.7.1"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "0k5d6zph6sq1qg8vi5jmk7apy6v67xn5i7rqjamyr5an7lpxssc9"; + sha256 = "1nvz4nqkn8pl25zyw7x5079dbzmwdxsar9gbcjk1srfpa746j1y4"; }; postInstall = '' @@ -22,4 +22,10 @@ buildGoPackage rec { fi done ''; + + meta = with stdenv.lib; { + description = "Tool for building, changing, and versioning infrastructure"; + homepage = "https://www.terraform.io/"; + license = licenses.mpl20; + }; } diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index d4dd13b880d..eb5d12ed82c 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp ./* $out/bin/ -R - wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib + wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]} ''; } diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index cc66976b3ba..751f6f9855b 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { postInstall = '' sed <"frontends/snipe" >"$out/bin/snipe" \ - -e "2i export PATH=\"$out/bin:${coreutils}/bin:${gawk}/bin:${bash}/bin:${which}/bin:\$PATH\"" + -e "2i export PATH=\"$out/bin:${stdenv.lib.makeBinPath [ coreutils gawk bash which ]}:\$PATH\"" chmod 555 "$out/bin/snipe" ''; diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 319d7488b6b..0cd603996c1 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { installPhase = '' make install for file in "$out"/bin/* "$out"/sbin/*; do - wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl.out}/lib:${gcc.cc}/lib:${stdenv.glibc.out}/lib::${gcc.cc}/lib64:${stdenv.glibc.out}/lib64:${libedit}/lib:${qt4}/lib" + wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${stdenv.lib.makeLibraryPath [ openssl gcc.cc stdenv.glibc libedit qt4 ]}" done ''; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index a5a6e2b688a..ac2daaa856f 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -4,7 +4,7 @@ let - version = "4.0.1641"; + version = "4.26.0.1655"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -43,7 +43,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "15xy89qmldp1zs3f809b8sayvawc7sz24l0718iib83g5jzvivsm"; + sha256 = "1y484cp77kz984z9zdsy6c4669fmwv2knc287c1v24s81p5pqygg"; } else throw "HipChat is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index d7b98d535af..ee05f16a8f4 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/jitsi substituteInPlace $out/bin/jitsi \ --subst-var-by JAVA ${jdk}/bin/java \ - --subst-var-by EXTRALIBS ${gtk2}/lib + --subst-var-by EXTRALIBS ${gtk2.out}/lib patchShebangs $out libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}" 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 41a1ea3c3e7..245894147dc 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.out}/bin"; + wrapArgs = "--prefix PATH ':' ${stdenv.lib.makeBinPath [ texLive imagemagick ]}"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix index 7322ff2bb34..10f63369a9b 100644 --- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix @@ -77,7 +77,7 @@ rec { # gtk3 programs have the runtime dependency on XDG_DATA_DIRS preFixup = '' for f in "$out/bin/sflphone" "$out/bin/sflphone-client-gnome"; do - wrapProgram $f --prefix XDG_DATA_DIRS ":" "${gtk}/share:$GSETTINGS_SCHEMAS_PATH" + wrapProgram $f --prefix XDG_DATA_DIRS ":" "${gtk.out}/share:$GSETTINGS_SCHEMAS_PATH" done ''; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index f16ee8bd5cc..9c25c6eaad2 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { wrapProgram $out/opt/viber/Viber \ --set QT_PLUGIN_PATH "$out/opt/viber/plugins" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ - --set QTCOMPOSE "${xorg.libX11}/share/X11/locale" + --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" ln -s $out/opt/viber/Viber $out/bin/viber mv $out/usr/share $out/share diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 4a37c4e8679..be74e079691 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { postInstall = '' wrapProgram $out/bin/mailpile \ - --prefix PATH ":" "${gnupg1orig}/bin:${openssl.bin}/bin" + --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 08152547555..ae60ae11309 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking.out}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" done ''; diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 51d7a49cac7..d674c70e4c2 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, ant, jdk, bash, coreutils, substituteAll }: +{ stdenv, fetchurl, fetchFromGitHub, ant, jdk, bash, coreutils, substituteAll }: let freenet_ext = fetchurl { @@ -6,28 +6,30 @@ let sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij"; }; + bcprov_version = "jdk15on-154"; bcprov = fetchurl { - url = https://downloads.freenetproject.org/latest/bcprov-jdk15on-152.jar; - sha256 = "0wqpdcvcfh939fk8yr033ijzr1vjbp6ydlnv5ly8jiykwj0x3i0d"; + url = "https://www.bouncycastle.org/download/bcprov-ext-${bcprov_version}.jar"; + sha256 = "0abmhg2h44g8c5p7skzqwfxj8xwcjh9vs84mc0hr78k1am0633jk"; }; seednodes = fetchurl { url = https://downloads.freenetproject.org/alpha/opennet/seednodes.fref; - sha256 = "109zn9w8axdkjwhkkcm2s8dvib0mq0n8imjgs3r8hvi128cjsmg9"; + sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv"; }; - version = "build01470"; + version = "build01475"; freenet-jars = stdenv.mkDerivation { name = "freenet-jars-${version}"; - src = fetchgit { - url = https://github.com/freenet/fred; - rev = "refs/tags/${version}"; - sha256 = "1b6e6fec2b9a729d4a25605fa142df9ea42e59b379ff665f580e32c6178c9746"; + src = fetchFromGitHub { + owner = "freenet"; + repo = "fred"; + rev = version; + sha256 = "0k02fna9x219j7dhginbnf27i36bibb0rmm4qdwr5xm28hy1nd08"; }; patchPhase = '' cp ${freenet_ext} lib/freenet/freenet-ext.jar - cp ${bcprov} lib/bcprov-jdk15on-152.jar + cp ${bcprov} lib/bcprov-${bcprov_version}.jar sed '/antcall.*-ext/d' -i build.xml sed 's/@unknown@/${version}/g' -i build-clean.xml @@ -39,7 +41,7 @@ let installPhase = '' mkdir -p $out/share/freenet - cp lib/bcprov-jdk15on-152.jar $out/share/freenet + cp lib/bcprov-${bcprov_version}.jar $out/share/freenet cp lib/freenet/freenet-ext.jar $out/share/freenet cp dist/freenet.jar $out/share/freenet ''; @@ -51,7 +53,7 @@ in stdenv.mkDerivation { src = substituteAll { src = ./freenetWrapper; - inherit bash coreutils seednodes; + inherit bash coreutils seednodes bcprov_version; freenet = freenet-jars; jre = jdk.jre; }; diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper index 6df7f492458..f3106265801 100755 --- a/pkgs/applications/networking/p2p/freenet/freenetWrapper +++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper @@ -15,4 +15,4 @@ cp -u @seednodes@ $FREENET_HOME/seednodes.fref chmod u+rw $FREENET_HOME/seednodes.fref cd $FREENET_HOME -@jre@/bin/java -cp @freenet@/share/freenet/bcprov-jdk15on-152.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter +@jre@/bin/java -cp @freenet@/share/freenet/bcprov-@bcprov_version@.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 6d14761356a..4f64e947f09 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \ --set ICAROOT "$ICAInstDir" \ - --set GTK_PATH "${gtk}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ + --set GTK_PATH "${gtk.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_LIBRARY_PATH "$libPath" \ diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 555667c035c..7f718dfdbe2 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec make install wrapProgram $out/bin/seafile-applet \ - --suffix PATH : ${ccnet}/bin:${seafile-shared}/bin + --suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]} ''; meta = diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index c4350c67807..99107787493 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { postInstall = '' for i in $out/bin/*; do wrapProgram $i \ - --prefix PATH ':' "${pstoedit}/bin" \ + --prefix PATH ':' "${pstoedit.out}/bin" \ --prefix XDG_DATA_DIRS ':' "${oxygen_icons}/share" done ''; diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index 4a997d08d83..5c87218e306 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { --set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \ --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ - --prefix PATH ":" "$out/bin:${perl}/bin:${gconf}/bin" + --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}" done rm $out/share/icons/hicolor/icon-theme.cache diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 87e7ce261a1..7ef77dc2562 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0" \ --prefix PERL5LIB ":" "$PERL5LIB" \ --set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \ - --prefix PATH ":" "$out/bin:${perl}/bin:${gconf}/bin" + --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}" done rm $out/share/icons/hicolor/icon-theme.cache ''; # The following settings fix failures in the test suite. It's not required otherwise. - NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib}/lib"; + NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib.out}/lib"; preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash"; doCheck = false; # https://github.com/NixOS/nixpkgs/issues/11084 diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 9eaaf903585..284ea570456 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip +{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which @@ -247,7 +247,7 @@ in stdenv.mkDerivation rec { libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base gsettings_desktop_schemas glib neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler - python3 sablotron sane-backends tcsh unzip vigra which zip zlib + python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libxshmfence libatomic_ops graphite2 harfbuzz librevenge libe-book libmwaw glm glew ncurses diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 8c69d610a9a..4ec179b8f6e 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip +{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which @@ -241,7 +241,7 @@ in stdenv.mkDerivation rec { libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base gsettings_desktop_schemas glib neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler - python3 sablotron sane-backends tcsh unzip vigra which zip zlib + python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libxshmfence libatomic_ops graphite2 harfbuzz librevenge libe-book libmwaw glm glew ncurses diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 7935be11926..6f42ff15a22 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax" cp bin/satallax.opt "$out/bin/satallax" wrapProgram "$out/bin/satallax" \ - --suffix PATH : "${coq}/bin:${eprover}/bin:$out/libexec/satallax" \ + --suffix PATH : "${stdenv.lib.makeBinPath [ coq eprover ]}:$out/libexec/satallax" \ --add-flags "-M" --add-flags "$out/lib/satallax/modes" cp LICENSE README "$out/share/doc/satallax" diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 0e30f0239bf..0f92bcbe0ae 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre -, SDL_image, glew, mesa, boost, glm +, SDL_image, freetype, glew, mesa, boost, glm }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa - boost glm + boost glm freetype ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix index 8c67b667a32..a0605bb7128 100644 --- a/pkgs/applications/video/mkcast/default.nix +++ b/pkgs/applications/video/mkcast/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = '' for f in $out/bin/*; do #*/ - wrapProgram $f --prefix PATH : "${xdpyinfo}/bin:${wmctrl}/bin/:${byzanz}/bin/:${gnome3.gnome_terminal}/bin/:$out/bin" + wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome_terminal ]}:$out/bin" done rm -r screenkey/.bzr diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 6109e96d974..efab9703df3 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share/shotcut cp -r src/qml $out/share/shotcut/ - wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${jack1}/lib:${SDL.out}/lib + wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/vlc/plugin.nix b/pkgs/applications/video/vlc/plugin.nix new file mode 100644 index 00000000000..3a3e9162999 --- /dev/null +++ b/pkgs/applications/video/vlc/plugin.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, vlc, autoconf, automake, libtool, pkgconfig, npapi_sdk, +libxcb, xlibsWrapper, gtk}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "vlc-plugin-${version}"; + version = "2.2.2"; # This 2.2.2 builds fine with vlc 2.2.4 + + src = fetchgit { + url = "https://code.videolan.org/videolan/npapi-vlc.git"; + rev = "5fa6fbc11cf5bad983f57656c0085e47e18fbf20"; + sha256 = "18fbiy4r8rlw4fsgcxgzhi6qi9r48d0rmnp8hs994w2p94fa8kwd"; + }; + + preConfigure = "sh autogen.sh"; + + buildInputs = [ vlc autoconf automake libtool pkgconfig npapi_sdk libxcb + xlibsWrapper gtk ]; + + enableParallelBuilding = true; + + passthru = { + mozillaPlugin = "/lib/mozilla/plugins"; + }; + + meta = with stdenv.lib; { + description = "Webplugins based on libVLC (for firefox, npapi)"; + homepage = https://code.videolan.org/videolan/npapi-vlc; + platforms = platforms.linux; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index cfa58c71768..3d69de9c15b 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz.bin}/bin:${utillinux}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ iproute iptables e2fsprogs xz utillinux ]}" # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service diff --git a/pkgs/applications/virtualization/docker/gc.nix b/pkgs/applications/virtualization/docker/gc.nix index f9fb6311fc3..dcac628e367 100644 --- a/pkgs/applications/virtualization/docker/gc.nix +++ b/pkgs/applications/virtualization/docker/gc.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp docker-gc $out/bin chmod +x $out/bin/docker-gc wrapProgram $out/bin/docker-gc \ - --prefix PATH : "${docker}/bin:${coreutils}/bin:${procps}/bin:${gnused}/bin:${findutils}/bin:${gnugrep}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ docker coreutils procps gnused findutils gnugrep ]}" ''; meta = { diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index f5e0441ea6c..dd8ddfd0e0b 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -36,9 +36,7 @@ in stdenv.mkDerivation rec { postInstall = '' sed -i 's,which ,command -v ,' "$out/etc/vmware-tools/scripts/vmware/network" wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ - --prefix PATH ':' "${iproute}/bin" \ - --prefix PATH ':' "${dbus}/bin" \ - --prefix PATH ':' "${systemd}/bin" + --prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 1d37e45b23d..6208ad624ec 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation { for i in lib/VBoxOGL*.so do - patchelf --set-rpath $out/lib:${dbus.lib}/lib:${libXcomposite.out}/lib:${libXdamage.out}/lib:${libXext.out}/lib:${libXfixes.out}/lib $i + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" dbus libXcomposite libXdamage libXext libXfixes ]} $i done # FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index a62a1a20092..a036cd8d564 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -143,6 +143,9 @@ stdenv.mkDerivation { touch tools/include/gnu/stubs-32.h ''; + # Fix build on Glibc 2.24. + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + # TODO: Flask needs more testing before enabling it by default. #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index d4721c99200..3a2a030b8a4 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ - --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl.bin}/bin:${alsaUtils}/bin:${findutils}/bin:${xterm}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" wrapProgram $out/bin/awesome-client \ --prefix PATH : "${which}/bin" diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix index afa7d123107..61b35631178 100644 --- a/pkgs/applications/window-managers/compton/git.nix +++ b/pkgs/applications/window-managers/compton/git.nix @@ -4,13 +4,13 @@ libXrandr, libXrender, xwininfo }: stdenv.mkDerivation { - name = "compton-git-2015-09-21"; + name = "compton-git-2016-08-10"; src = fetchFromGitHub { owner = "chjj"; repo = "compton"; - rev = "2343e4bbd298b35ea5c190c52abd2b0cb9f79a18"; - sha256 = "1pb0ic47sfd796crwk47cya2ahbxsm6ygi6sh4fwd734kwz37h4z"; + rev = "f1cd308cde0f1e1f21ec2ac8f16a3c873fa22d3a"; + sha256 = "1ky438d1rsg4ylkcp60m82r0jck8rks3gfa869rc63k37p2nfn8p"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 91ee7dedb5d..2ce69a68f32 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { cp $out/share/stumpwm/modules/util/stumpish/stumpish $out/bin/ chmod +x $out/bin/stumpish wrapProgram $out/bin/stumpish \ - --prefix PATH ":" "${rlwrap}/bin:${gnused}/bin:${gnugrep}/bin:${coreutils}/bin:${xprop}/bin" + --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap gnused gnugrep coreutils xprop ]}" # Paths in the compressed image $out/bin/stumpwm are not # recognized by Nix. Add explicit reference here. diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index fafef169bd5..5b407f530dc 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -587,7 +587,7 @@ rec { buildCommand = '' ${createRootFS} - PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma.bin}/bin + PATH=$PATH:${stdenv.lib.makeBinPath [ dpkg dpkg glibc lzma ]} # Unpack the .debs. We do this to prevent pre-install scripts # (which have lots of circular dependencies) from barfing. diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 65df7fc1f95..98ce946044d 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { major = "0.0"; - minor = "24"; + minor = "25"; name = "cantarell-fonts-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/cantarell-fonts/${major}/${name}.tar.xz"; - sha256 = "0r4jnc2x9yncf40lixjb1pqgpq8rzbi2fz33pshlqzjgx2d69bcw"; + sha256 = "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl"; }; meta = { diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index fc584b432f1..218de3bfa7c 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { patches = [ ./efl-elua.patch ]; preConfigure = '' - export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH" + export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base.dev}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH" ''; diff --git a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix index a9bb87d4ddd..6ae149cd570 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar" "--disable-libcryptui" ]; - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss}/include/nss -I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.20/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gedit/default.nix index d0c48752e73..69056e28c26 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/gedit/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib") + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gnome3.libpeas gnome3.gtksourceview ]}") ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix index 08cfa6c2363..edb0075fdae 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { wrapProgram "$prog" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin:${qemu}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}" done ''; diff --git a/pkgs/desktops/gnome-3/3.20/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.20/core/empathy/default.nix index 207ccbe1d36..9a29d11f1ae 100644 --- a/pkgs/desktops/gnome-3/3.20/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/empathy/default.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas file libtool librsvg ]; - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0" - "-I${dbus_libs}/include/dbus-1.0" - "-I${dbus_libs}/lib/dbus-1.0/include" ]; + NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" + "-I${dbus_libs.dev}/include/dbus-1.0" + "-I${dbus_libs.dev}/lib/dbus-1.0/include" ]; preFixup = '' for f in $out/bin/* $out/libexec/*; do diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix index 322dd3bedac..5043d7cf2fe 100644 --- a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf ]; - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss}/include/nss -I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.20/core/folks/default.nix b/pkgs/desktops/gnome-3/3.20/core/folks/default.nix index 5daa33629ff..842864b0b81 100644 --- a/pkgs/desktops/gnome-3/3.20/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/folks/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { configureFlags = "--disable-fatal-warnings"; - NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" - "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"]; + NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss}/include/nss" + "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix index e1b81339e91..23cdf41d5c0 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix @@ -7,6 +7,26 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + # Fix for https://github.com/NixOS/nixpkgs/issues/17912 + # See also https://bugzilla.gnome.org/show_bug.cgi?id=673101 + # Should be removed when next release comes out + srcHistoryEntry = fetchurl { + url = "https://raw.githubusercontent.com/GNOME/gnome-calculator/9bb6936ba74602ec891c1ffecdf1665dba1a1be4/data/history-entry.ui"; + sha256 = "0a6d6anwrg5l3kc7i8jyky4idnzi9bhjv9awi6615505pjhcxnaj"; + }; + + srcHistoryView = fetchurl { + url = "https://raw.githubusercontent.com/GNOME/gnome-calculator/b87b4f5cd0cff0b9cf9e9cd2a056c56be653cab1/data/history-view.ui"; + sha256 = "0zyq1mcxsh707jhh3vfqplk5s83lb26gvjz62l5l6rq5yrd43fyw"; + }; + + prePatch = '' + [ -f data/history-entry.ui ] && echo Remove the fix && exit 1 + [ -f data/history-view.ui ] && echo Remove the fix && exit 1 + cp -v ${srcHistoryEntry} data/history-entry.ui + cp -v ${srcHistoryView} data/history-view.ui + ''; + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/default.nix index 8421bb362c3..c94c178558d 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/gnome-dictionary" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix index e3dc558a49a..3ea108808f5 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/gnome-keyring" \ - --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" wrapProgram "$out/bin/gnome-keyring-daemon" \ - --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/default.nix index 703d55e42d0..85c15042614 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; + NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/default.nix index 72aa97fa6b6..29ebe8b0ca6 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/gnome-screenshot" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix index 8f876386f32..69b908ec01e 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; + # FIXME: glib binaries shouldn't be in .dev! preFixup = '' wrapProgram "$out/bin/gnome-session" \ - --prefix PATH : "${glib}/bin" \ + --prefix PATH : "${glib.dev}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix index 2a93328d8ca..00999353c2f 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix @@ -16,10 +16,11 @@ stdenv.mkDerivation rec { polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; + # FIXME: glib binaries shouldn't be in .dev! preFixup = '' wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PATH : "${glib}/bin" \ + --prefix PATH : "${glib.dev}/bin" \ --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-system-log/default.nix index 271f23e6920..50ee229cfa4 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-system-log/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/gnome-system-log" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix index 977c5800aeb..a405751a963 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf ''; - configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd" - "--with-modules-path=${apacheHttpd_2_2}/modules" + configureFlags = [ "--with-httpd=${apacheHttpd_2_2.out}/bin/httpd" + "--with-modules-path=${apacheHttpd_2_2.dev}/modules" "--disable-bluetooth" "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; diff --git a/pkgs/desktops/gnome-3/3.20/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.20/core/tracker/default.nix index 4d84e2980d5..72ebd543e90 100644 --- a/pkgs/desktops/gnome-3/3.20/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/tracker/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0 -I${poppler}/include/poppler"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -I${poppler.dev}/include/poppler"; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix index ffd5a279e73..e98c2ae8e57 100644 --- a/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gitg" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor.nix b/pkgs/desktops/gnome-3/extensions/system-monitor.nix index f9b13df7f76..0c3e65633c8 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; buildPhase = '' - ${glib}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas + ${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas ''; installPhase = '' diff --git a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix index 845d21f5219..1487efe0a23 100644 --- a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix +++ b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; buildPhase = '' - ${glib}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas + ${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas ''; installPhase = '' diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh index c0d5f6dbf59..a39b388cbb7 100755 --- a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh +++ b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh @@ -119,9 +119,12 @@ if test $returncode -ne 0; then fi [ -r $configDir/startupconfig ] && . $configDir/startupconfig -if test "$kdeglobals_kscreen_scalefactor" -ne 1; then - export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor +if [ "$kdeglobals_kscreen_screenscalefactors" ]; then + export QT_SCREEN_SCALE_FACTORS="$kdeglobals_kscreen_screenscalefactors" fi +#Manually disable auto scaling because we are scaling above +#otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us +export QT_AUTO_SCREEN_SCALE_FACTOR=0 XCURSOR_PATH=~/.icons IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS" @@ -159,6 +162,12 @@ unset THEME # xsetroot -cursor_name left_ptr +if test "$kcmfonts_general_forcefontdpi" -ne 0; then + xrdb -quiet -merge -nocpp <&2 # Make sure that D-Bus is running -if $qdbus >/dev/null 2>/dev/null; then +if qdbus >/dev/null 2>/dev/null; then : # ok else echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 @@ -240,7 +249,7 @@ KDE_SESSION_VERSION=5 export KDE_SESSION_VERSION xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 -KDE_SESSION_UID=`id -ru` +KDE_SESSION_UID=$(id -ru) export KDE_SESSION_UID XDG_CURRENT_DESKTOP=KDE @@ -278,11 +287,6 @@ fi qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit -# (NixOS) Run kbuildsycoca5 before starting the user session because things -# may be missing or moved if they have run nixos-rebuild and it may not be -# possible for them to start Konsole to run it manually! -kbuildsycoca5 - # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence # if the KDEWM environment variable has been set, then it will be used as KDE's diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index ca3e9c6956d..85caa82a155 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { sed -ie 's#/usr/share/zoneinfo/#${tzdata}/share/zoneinfo/#g' \ $out/lib/factor/extra/tzinfo/tzinfo.factor - sed -ie 's#/usr/share/terminfo#${ncurses}/share/terminfo#g' \ + sed -ie 's#/usr/share/terminfo#${ncurses.out}/share/terminfo#g' \ $out/lib/factor/extra/terminfo/terminfo.factor cp ./factor $out/bin diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix index 65c0f2ea1c5..7908d6d06ef 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { for f in $(find $out); do if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then patchelf --set-interpreter ${getLib glibc}/lib/ld-linux.so.2 \ - --set-rpath $out/lib:${getLib gcc}/lib:${ncurses.out}/lib \ + --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" gcc ncurses ]} \ "$f" || true fi done diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 844530ae639..74c198696b6 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -335,8 +335,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 diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 2df019bd7f1..5e5157215d3 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { (if stdenv.isLinux then '' find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libedit}/lib:${ncurses5.out}/lib:${gmp.out}/lib" {} \; + --set-rpath "${lib.makeLibraryPath [ libedit ncurses5 gmp ]}" {} \; for prog in ld ar gcc strip ranlib; do find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; done diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 9b9da4d4f78..6140cde4a9e 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { stdenv.lib.optionalString stdenv.isLinux '' find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${ncurses5.out}/lib:${gmp.out}/lib" {} \; + --set-rpath "${stdenv.lib.makeLibraryPath [ ncurses5 gmp ]}" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 for prog in ld ar gcc strip ranlib; do diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index 4f13954d1db..2e96c999b9e 100644 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ b/pkgs/development/compilers/ghc/7.10.2.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i done ''; diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index b8e9082f061..c059a89bde3 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i done ''; diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 5faae118d8c..25eabc769aa 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${gmp.out}/lib" {} \; + --set-rpath "${stdenv.lib.makeLibraryPath [ "$out" gmp ]}" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 for prog in ld ar gcc strip ranlib; do diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 9e379f06b21..8341fca9f42 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i done ''; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 79234fd55ab..0f3b57949b7 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i done ''; diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 1dc6805bcd3..36b6c21aebb 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { for prog in "$out/bin/julia" "$out/bin/julia-debug"; do wrapProgram "$prog" \ --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ - --prefix PATH : "${curl}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" done ''; diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index 80aaf6dd01f..73c2cc0b30a 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -163,8 +163,8 @@ stdenv.mkDerivation rec { postInstall = '' for prog in "$out/bin/julia" "$out/bin/julia-debug"; do wrapProgram "$prog" \ - --prefix LD_LIBRARY_PATH : "$out/lib/julia:$LD_LIBRARY_PATH" \ - --prefix PATH : "${curl}/bin" + --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" done ''; diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix index 64d86aaac0d..4fd71b748cc 100644 --- a/pkgs/development/compilers/microscheme/default.nix +++ b/pkgs/development/compilers/microscheme/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { make install PREFIX=$out wrapProgram $out/bin/microscheme \ - --prefix PATH : "${avrdude}/bin:${avrgcclibc}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ avrdude avrgcclibc ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 40c71926279..2e691dc749d 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Paths so the opa compiler code generation will use the same programs as were # used to build opa. - codeGeneratorPaths = "${ocamlPackages.ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin:${nodejs}/bin"; + codeGeneratorPaths = stdenv.lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ]; preConfigure = '' patchShebangs . diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 49d1c64bfb9..8382be7a209 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { for a in "$out"/lib/*.so; do patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" done - sed -i -e "s|\-lgc|\-L${boehmgc}\/lib -lgc|" $out/lib/config.jam + sed -i -e "s|\-lgc|\-L${boehmgc.out}\/lib -lgc|" $out/lib/config.jam wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin ''; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index e5f7612c487..93ce5037fed 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { checkTarget = "test"; preCheck = '' - export LIBRARY_PATH="$out/lib:${openssl.out}/lib:${pcre2}/lib" + export LIBRARY_PATH="$out/lib:${stdenv.lib.makeLibraryPath [ openssl pcre2 ]}" ''; installPhase = '' diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 69529ab762b..af56026b43a 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postPatch = '' for i in squeak.in squeak.sh.in; do substituteInPlace unix/cmake/$i --replace "PATH=" \ - "PATH=${coreutils}/bin:${gnused}/bin:${which}/bin #" + "PATH=${stdenv.lib.makeBinPath [ coreutils gnused which ]} #" done ''; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8175b3e639b..6c3eb98d853 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -67960,7 +67960,7 @@ self: { doHaddock = false; preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + PKG_CONFIG_PATH+=":${cairo.dev}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; homepage = "https://github.com/haskell-gi/haskell-gi"; @@ -67986,7 +67986,7 @@ self: { doHaddock = false; preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + PKG_CONFIG_PATH+=":${cairo.dev}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; homepage = "https://github.com/haskell-gi/haskell-gi"; diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index fc3070e55f1..1824287c823 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { b=$(basename $f) if [ $b == "mix" ]; then continue; fi wrapProgram $f \ - --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl.bin}/bin:${bash}/bin" \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \ --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt done diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index 7323fafaf97..ffc4c27e662 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index cb29341689d..56b4626a212 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 34896046e31..5d9c5dac3d8 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 8eac077a110..1cd68221fa7 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/interpreters/lfe/default.nix b/pkgs/development/interpreters/lfe/default.nix index f3a54aef8ab..c7957275f9e 100644 --- a/pkgs/development/interpreters/lfe/default.nix +++ b/pkgs/development/interpreters/lfe/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # Add some stuff to PATH so the scripts can run without problems. for f in $out/bin/*; do wrapProgram $f \ - --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${bash}/bin:$out/bin" + --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils bash ]}:$out/bin" substituteInPlace $f --replace "/usr/bin/env" "${coreutils}/bin/env" done ''; diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 76b08cd35c6..8053c82e90e 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; NIX_CFLAGS_COMPILE = '' - -I${SDL}/include/SDL + -I${SDL.dev}/include/SDL -I${freetype.dev}include/freetype2 ''; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 6c3920ff8aa..ca0bbd6a01c 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap -, openglSupport ? false, mesa ? null -, alsaSupport ? true, alsaLib ? null -, x11Support ? true, xlibsWrapper ? null, libXrandr ? null -, pulseaudioSupport ? true, libpulseaudio ? null +, openglSupport ? false, mesa_noglu +, alsaSupport ? true, alsaLib +, x11Support ? true, libXext, libICE, libXrandr +, pulseaudioSupport ? true, libpulseaudio , OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa }: @@ -10,17 +10,12 @@ # PulseAudio. assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (mesa != null && x11Support); -assert x11Support -> (xlibsWrapper != null && libXrandr != null); -assert alsaSupport -> alsaLib != null; -assert pulseaudioSupport -> libpulseaudio != null; - let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.2.15"; name = "SDL-${version}"; + version = "1.2.15"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; @@ -34,10 +29,10 @@ stdenv.mkDerivation rec { # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. propagatedBuildInputs = - optionals x11Support [ xlibsWrapper libXrandr ] ++ + optionals x11Support [ libXext libICE libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ - optional openglSupport mesa ++ + optional openglSupport mesa_noglu ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; @@ -57,9 +52,9 @@ stdenv.mkDerivation rec { "--enable-rpath" "--disable-pulseaudio-shared" "--disable-osmesa-shared" - ] ++ stdenv.lib.optionals (stdenv ? cross) ([ + ] ++ optionals (stdenv ? cross) ([ "--without-x" - ] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"); + ] ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"); patches = [ # Fix window resizing issues, e.g. for xmonad @@ -95,15 +90,18 @@ stdenv.mkDerivation rec { url = "http://hg.libsdl.org/SDL/raw-rev/bbfb41c13a87"; sha256 = "1336g7waaf1c8yhkz11xbs500h8bmvabh4h437ax8l1xdwcppfxv"; }) + ./find-headers.patch ]; postFixup = ''moveToOutput share/aclocal "$dev" ''; + setupHook = ./setup-hook.sh; + passthru = { inherit openglSupport; }; meta = with stdenv.lib; { description = "A cross-platform multimedia library"; - homepage = http://www.libsdl.org/; + homepage = "http://www.libsdl.org/"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/SDL/find-headers.patch b/pkgs/development/libraries/SDL/find-headers.patch new file mode 100644 index 00000000000..5f75ae9e830 --- /dev/null +++ b/pkgs/development/libraries/SDL/find-headers.patch @@ -0,0 +1,16 @@ +diff -ru3 SDL-1.2.15/sdl-config.in SDL-1.2.15-new/sdl-config.in +--- SDL-1.2.15/sdl-config.in 2012-01-19 10:30:06.000000000 +0400 ++++ SDL-1.2.15-new/sdl-config.in 2016-08-22 05:32:52.716397920 +0300 +@@ -42,7 +42,11 @@ + echo @SDL_VERSION@ + ;; + --cflags) +- echo -I@includedir@/SDL @SDL_CFLAGS@ ++ SDL_CFLAGS="" ++ for i in @includedir@/SDL $SDL_PATH; do ++ SDL_CFLAGS="$SDL_CFLAGS -I$i" ++ done ++ echo $SDL_CFLAGS @SDL_CFLAGS@ + ;; + @ENABLE_SHARED_TRUE@ --libs) + @ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ diff --git a/pkgs/development/libraries/SDL/setup-hook.sh b/pkgs/development/libraries/SDL/setup-hook.sh new file mode 100644 index 00000000000..3696e743a07 --- /dev/null +++ b/pkgs/development/libraries/SDL/setup-hook.sh @@ -0,0 +1,11 @@ +addSDLPath () { + if [ -e "$1/include/SDL" ]; then + export SDL_PATH="$SDL_PATH $1/include/SDL" + fi +} + +if test -n "$crossConfig"; then + crossEnvHooks+=(addSDLPath) +else + envHooks+=(addSDLPath) +fi diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 1c260c2ba91..16aa4f6c2f7 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, audiofile -, openglSupport ? false, mesa ? null -, alsaSupport ? true, alsaLib ? null -, x11Support ? true, xlibsWrapper ? null, libXrandr ? null -, pulseaudioSupport ? true, libpulseaudio ? null +{ stdenv, lib, fetchurl, pkgconfig, audiofile +, openglSupport ? false, mesa_noglu +, alsaSupport ? true, alsaLib +, x11Support ? true, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr +, dbusSupport ? false, dbus +, udevSupport ? false, udev +, ibusSupport ? false, ibus +, pulseaudioSupport ? true, libpulseaudio , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL }: @@ -10,35 +13,39 @@ # PulseAudio. assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support); -assert x11Support -> (xlibsWrapper != null && libXrandr != null); -assert alsaSupport -> alsaLib != null; -assert pulseaudioSupport -> libpulseaudio != null; +assert openglSupport -> (stdenv.isDarwin || mesa_noglu != null && x11Support); let - configureFlagsFun = attrs: '' - --disable-oss --disable-x11-shared - --disable-pulseaudio-shared --disable-alsa-shared - ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib.out}/lib" else ""} - ${if (!x11Support) then "--without-x" else ""} - ''; + configureFlagsFun = attrs: [ + "--disable-oss" "--disable-x11-shared" + "--disable-pulseaudio-shared" "--disable-alsa-shared" + ] ++ lib.optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib" + ++ lib.optional (!x11Support) "--without-x"; in stdenv.mkDerivation rec { - name = "SDL2-2.0.3"; + name = "SDL2-${version}"; + version = "2.0.4"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; - sha256 = "0369ngvb46x6c26h8zva4x22ywgy6mvn0wx87xqwxg40pxm9m9m5"; + sha256 = "0jqp46mxxbh9lhpx1ih6sp93k752j2smhpc0ad0q4cb3px0famfs"; }; - # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. - propagatedBuildInputs = stdenv.lib.optionals x11Support [ xlibsWrapper libXrandr ] ++ - stdenv.lib.optional pulseaudioSupport libpulseaudio; + patches = [ ./find-headers.patch ]; - buildInputs = [ pkgconfig audiofile ] ++ - stdenv.lib.optional openglSupport mesa ++ - stdenv.lib.optional alsaSupport alsaLib ++ - stdenv.lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; + nativeBuildInputs = [ pkgconfig ]; + + # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. + propagatedBuildInputs = lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] ++ + lib.optional pulseaudioSupport libpulseaudio; + + buildInputs = [ audiofile ] ++ + lib.optional openglSupport mesa_noglu ++ + lib.optional alsaSupport alsaLib ++ + lib.optional dbusSupport dbus ++ + lib.optional udevSupport udev ++ + lib.optional ibusSupport ibus ++ + lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 dontDisableStatic = true; @@ -49,20 +56,22 @@ stdenv.mkDerivation rec { configureFlags = configureFlagsFun { inherit alsaLib; }; crossAttrs = { - configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; }; + configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; }; }; postInstall = '' rm $out/lib/*.a ''; - passthru = {inherit openglSupport;}; + setupHook = ./setup-hook.sh; - meta = { + passthru = { inherit openglSupport; }; + + meta = with stdenv.lib; { description = "A cross-platform multimedia library"; - homepage = http://www.libsdl.org/; - license = stdenv.lib.licenses.zlib; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.page ]; + homepage = "http://www.libsdl.org/"; + license = licenses.zlib; + platforms = platforms.all; + maintainers = with maintainers; [ page ]; }; } diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/development/libraries/SDL2/find-headers.patch new file mode 100644 index 00000000000..a6114901055 --- /dev/null +++ b/pkgs/development/libraries/SDL2/find-headers.patch @@ -0,0 +1,26 @@ +diff -ru3 SDL2-2.0.4/sdl2-config.cmake.in SDL2-2.0.4-new/sdl2-config.cmake.in +--- SDL2-2.0.4/sdl2-config.cmake.in 2016-01-02 22:56:31.000000000 +0300 ++++ SDL2-2.0.4-new/sdl2-config.cmake.in 2016-08-22 05:26:42.420397323 +0300 +@@ -6,5 +6,5 @@ + set(SDL2_PREFIX "@prefix@") + set(SDL2_EXEC_PREFIX "@prefix@") + set(SDL2_LIBDIR "@libdir@") +-set(SDL2_INCLUDE_DIRS "@includedir@/SDL2") ++set(SDL2_INCLUDE_DIRS "@includedir@/SDL2" $ENV{SDL2_PATH}) + set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@") +diff -ru3 SDL2-2.0.4/sdl2-config.in SDL2-2.0.4-new/sdl2-config.in +--- SDL2-2.0.4/sdl2-config.in 2016-01-02 22:56:31.000000000 +0300 ++++ SDL2-2.0.4-new/sdl2-config.in 2016-08-22 05:32:02.256397839 +0300 +@@ -42,7 +42,11 @@ + echo @SDL_VERSION@ + ;; + --cflags) +- echo -I@includedir@/SDL2 @SDL_CFLAGS@ ++ SDL_CFLAGS="" ++ for i in @includedir@/SDL2 $SDL2_PATH; do ++ SDL_CFLAGS="$SDL_CFLAGS -I$i" ++ done ++ echo $SDL_CFLAGS @SDL_CFLAGS@ + ;; + @ENABLE_SHARED_TRUE@ --libs) + @ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ diff --git a/pkgs/development/libraries/SDL2/setup-hook.sh b/pkgs/development/libraries/SDL2/setup-hook.sh new file mode 100644 index 00000000000..5a26440f37b --- /dev/null +++ b/pkgs/development/libraries/SDL2/setup-hook.sh @@ -0,0 +1,11 @@ +addSDL2Path () { + if [ -e "$1/include/SDL2" ]; then + export SDL2_PATH="$SDL2_PATH $1/include/SDL2" + fi +} + +if test -n "$crossConfig"; then + crossEnvHooks+=(addSDL2Path) +else + envHooks+=(addSDL2Path) +fi diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 23a0924ad3b..1d26fed805e 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,30 +1,19 @@ -{stdenv, fetchsvn, SDL2}: +{ stdenv, fetchurl, SDL2 }: -let rev = 5; in stdenv.mkDerivation rec { - name = "SDL2_gfx-${toString rev}"; + name = "SDL2_gfx-${version}"; + version = "1.0.1"; - src = fetchsvn { - url = http://svn.code.sf.net/p/sdl2gfx/code/trunk; - inherit rev; - sha256 = "1hzilbn1412m2b44mygrbdfh1gvks4v5p0kmafz248jf9ifsvmzp"; + src = fetchurl { + url = "mirror://sourceforge/sdl2gfx/${name}.tar.gz"; + sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn"; }; - buildInputs = [ SDL2 ] ; + buildInputs = [ SDL2 ]; - configureFlags = "--disable-mmx"; + configureFlags = [ "--enable-mmx" ]; - postInstall = '' - sed -i -e 's,"SDL.h",,' \ - $out/include/SDL2/*.h - - ln -s $out/include/SDL2/SDL2_framerate.h $out/include/SDL2/SDL_framerate.h; - ln -s $out/include/SDL2/SDL2_gfxPrimitives.h $out/include/SDL2/SDL_gfxPrimitives.h; - ln -s $out/include/SDL2/SDL2_rotozoom.h $out/include/SDL2/SDL_rotozoom.h; - ln -s $out/include/SDL2/*.h $out/include/; - ''; - - meta = { + meta = with stdenv.lib; { description = "SDL graphics drawing primitives and support functions"; longDescription = '' @@ -45,10 +34,10 @@ stdenv.mkDerivation rec { code. Its is written in plain C and can be used in C++ code. ''; - homepage = https://sourceforge.net/projects/sdlgfx/; - license = stdenv.lib.licenses.lgpl2Plus; + homepage = "https://sourceforge.net/projects/sdlgfx/"; + license = licenses.zlib; - maintainers = [ stdenv.lib.maintainers.bjg ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ bjg ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index 7253fc7b4da..22282e1a10c 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -1,27 +1,20 @@ { stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libXpm, zlib }: stdenv.mkDerivation rec { - name = "SDL2_image-2.0.1"; + name = "SDL2_image-${version}"; + version = "2.0.1"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; sha256 = "0r3z1l7fdn76qkpy7snpkcjqz8dkv2zp6lsqpq25q4m5xsyaygis"; }; - buildInputs = [SDL2 libpng libjpeg libtiff libungif libXpm zlib]; + buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ]; - postInstall = '' - sed -i -e 's,"SDL.h",,' \ - -e 's,"SDL_version.h",,' \ - -e 's,"begin_code.h",,' \ - -e 's,"close_code.h",,' \ - $out/include/SDL2/SDL_image.h - ln -sv SDL2/SDL_image.h $out/include/SDL_image.h - ''; - - meta = { + meta = with stdenv.lib; { description = "SDL image library"; homepage = "http://www.libsdl.org/projects/SDL_image/"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.zlib; }; } diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 1a7ce841d0c..0919970543c 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, SDL2, libogg, libvorbis, enableNativeMidi ? false }: +{ stdenv, lib, fetchurl, SDL2, libogg, libvorbis, enableNativeMidi ? false }: stdenv.mkDerivation rec { - name = "SDL2_mixer-2.0.1"; + name = "SDL2_mixer-${version}"; + version = "2.0.1"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s"; }; - propagatedBuildInputs = [SDL2 libogg libvorbis]; + propagatedBuildInputs = [ SDL2 libogg libvorbis ]; - configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi "--enable-music-native-midi-gpl"; + configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl"; - postInstall = "ln -s $out/include/SDL2/SDL_mixer.h $out/include/"; - - meta = { + meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + homepage = "https://www.libsdl.org/projects/SDL_mixer/"; + license = licenses.zlib; }; } diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index 6f096577819..15a3305c7f4 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchurl, SDL2 }: stdenv.mkDerivation rec { - name = "SDL2_net-2.0.0"; + name = "SDL2_net-${version}"; + version = "2.0.1"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; - sha256 = "d715be30783cc99e541626da52079e308060b21d4f7b95f0224b1d06c1faacab"; + sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; }; - propagatedBuildInputs = [SDL2]; - - postInstall = "ln -s $out/include/SDL2/SDL_net.h $out/include/"; + propagatedBuildInputs = [ SDL2 ]; meta = with stdenv.lib; { description = "SDL multiplatform networking library"; - homepage = https://www.libsdl.org/projects/SDL_net; + homepage = "https://www.libsdl.org/projects/SDL_net"; license = licenses.zlib; - maintainers = [ maintainers.MP2E ]; + maintainers = with maintainers; [ MP2E ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 84944c0aa66..71aeecb3a80 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, SDL2, freetype }: +{ stdenv, fetchurl, SDL2, freetype, mesa_noglu }: stdenv.mkDerivation rec { - name = "SDL2_ttf-2.0.14"; + name = "SDL2_ttf-${version}"; + version = "2.0.14"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"; }; - buildInputs = [SDL2 freetype]; + buildInputs = [ SDL2 freetype mesa_noglu ]; - postInstall = "ln -s $out/include/SDL2/SDL_ttf.h $out/include/"; - - meta = { + meta = with stdenv.lib; { description = "SDL TrueType library"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.zlib; + homepage = "https://www.libsdl.org/projects/SDL_ttf/"; }; } diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 7bff348b754..ff8c081af93 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -1,7 +1,8 @@ -{stdenv, fetchurl, SDL} : +{ stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { - name = "SDL_gfx-2.0.25"; + name = "SDL_gfx-${version}"; + version = "2.0.25"; src = fetchurl { url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; @@ -10,16 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ] ; - configureFlags = "--disable-mmx"; + configureFlags = [ "--disable-mmx" ]; - postInstall = '' - sed -i -e 's,"SDL.h",,' \ - $out/include/SDL/*.h - - ln -s $out/include/SDL/*.h $out/include/; - ''; - - meta = { + meta = with stdenv.lib; { description = "SDL graphics drawing primitives and support functions"; longDescription = @@ -40,10 +34,10 @@ stdenv.mkDerivation rec { code. Its is written in plain C and can be used in C++ code. ''; - homepage = https://sourceforge.net/projects/sdlgfx/; - license = stdenv.lib.licenses.lgpl2Plus; + homepage = "https://sourceforge.net/projects/sdlgfx/"; + license = licenses.zlib; - maintainers = [ stdenv.lib.maintainers.bjg ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ bjg ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index a1d83950477..62af47807cc 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: stdenv.mkDerivation rec { - name = "SDL_image-1.2.12"; + name = "SDL_image-${version}"; + version = "1.2.12"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; @@ -10,18 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ]; - postInstall = '' - sed -i -e 's,"SDL.h",,' \ - -e 's,"SDL_version.h",,' \ - -e 's,"begin_code.h",,' \ - -e 's,"close_code.h",,' \ - $out/include/SDL/SDL_image.h - ln -sv SDL/SDL_image.h $out/include/SDL_image.h - ''; - meta = with stdenv.lib; { description = "SDL image library"; - homepage = http://www.libsdl.org/projects/SDL_image/; + homepage = "http://www.libsdl.org/projects/SDL_image/"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 2db10eeea76..d3d57947464 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libogg, libvorbis, smpeg, enableNativeMidi ? false, fluidsynth ? null }: +{ stdenv, lib, fetchurl, SDL, libogg, libvorbis, smpeg, enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { pname = "SDL_mixer"; @@ -10,21 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; - buildInputs = [SDL libogg libvorbis fluidsynth smpeg]; + buildInputs = [ SDL libogg libvorbis fluidsynth smpeg ]; - configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi " --enable-music-native-midi-gpl"; - - postInstall = '' - ln -s $out/include/SDL/SDL_mixer.h $out/include/ - - for f in $out/include/SDL/SDL_mixer.h - do - for i in SDL_types.h SDL_rwops.h SDL_audio.h SDL_endian.h SDL_version.h begin_code.h close_code.h - do - substituteInPlace $f --replace "#include \"$i\"" "#include " - done - done - ''; + configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl"; meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library"; diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index 045ad8925d9..b151d0ee83e 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -11,21 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz"; }; - propagatedBuildInputs = [SDL]; + propagatedBuildInputs = [ SDL ]; - postInstall = '' - sed -i -e 's,"SDL.h",,' \ - -e 's,"SDL_endian.h",,' \ - -e 's,"SDL_version.h",,' \ - -e 's,"begin_code.h",,' \ - -e 's,"close_code.h",,' \ - $out/include/SDL/SDL_net.h - - ln -sv $out/include/SDL/SDL_net.h $out/include/ - ''; - - meta = { + meta = with stdenv.lib; { description = "SDL networking library"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.zlib; + homepage = "https://www.libsdl.org/projects/SDL_net/release-1.2.html"; }; } diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix index 5ca64730f51..8d088b6bbf4 100644 --- a/pkgs/development/libraries/SDL_sound/default.nix +++ b/pkgs/development/libraries/SDL_sound/default.nix @@ -1,7 +1,8 @@ -{stdenv, fetchurl, SDL, libvorbis, flac, libmikmod}: +{ stdenv, fetchurl, SDL, libvorbis, flac, libmikmod }: stdenv.mkDerivation rec { - name = "SDL_sound-1.0.3"; + name = "SDL_sound-${version}"; + version = "1.0.3"; src = fetchurl { url = "http://icculus.org/SDL_sound/downloads/${name}.tar.gz"; @@ -10,10 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ SDL libvorbis flac libmikmod ]; - postInstall = "ln -s $out/include/SDL/SDL_sound.h $out/include/"; - - meta = { + meta = with stdenv.lib; { description = "SDL sound library"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.lgpl21; + homepage = "https://www.icculus.org/SDL_sound/"; }; } diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix index 52c43da9d16..2a4ddac524c 100644 --- a/pkgs/development/libraries/SDL_stretch/default.nix +++ b/pkgs/development/libraries/SDL_stretch/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchurl, SDL }: -stdenv.mkDerivation { - name = "SDL_stretch-0.3.1"; +stdenv.mkDerivation rec { + name = "SDL_stretch-${version}"; + version = "0.3.1"; src = fetchurl { - url = "mirror://sourceforge/sdl-stretch/0.3.1/SDL_stretch-0.3.1.tar.bz2"; + url = "mirror://sourceforge/sdl-stretch/${version}/${name}.tar.bz2"; sha256 = "1mzw68sn4yxbp8429jg2h23h8xw2qjid51z1f5pdsghcn3x0pgvw"; }; buildInputs = [ SDL ]; - meta = { + meta = with stdenv.lib; { description = "Stretch Functions For SDL"; homepage = "http://sdl-stretch.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix index 5e2081e750d..69b64629bd8 100644 --- a/pkgs/development/libraries/czmq/default.nix +++ b/pkgs/development/libraries/czmq/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, zeromq }: stdenv.mkDerivation rec { - baseName="czmq"; - version="3.0.2"; - name="${baseName}-${version}"; + version = "3.0.2"; + name = "czmq-${version}"; src = fetchurl { url = "http://download.zeromq.org/${name}.tar.gz"; sha256 = "16k9awrhdsymx7dnmvqcnkaq8lz8x8zppy6sh7ls8prpd6mkkjlb"; }; + # Fix build on Glibc 2.24. + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + # Needs to be propagated for the .pc file to work propagatedBuildInputs = [ zeromq ]; diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index d2b9581462b..549be9a71f5 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b"; }; - patches = [ ./gettext.patch ]; + patches = [ + ./gettext.patch # build error caused by CMake update + ./dependency.patch # build error: https://phabricator.kde.org/D1160 + ]; propagatedBuildInputs = [ kdelibs qt4 phonon ]; buildInputs = [ apr aprutil subversion boost qjson grantlee ]; diff --git a/pkgs/development/libraries/kdevplatform/dependency.patch b/pkgs/development/libraries/kdevplatform/dependency.patch new file mode 100644 index 00000000000..3205b4cab67 --- /dev/null +++ b/pkgs/development/libraries/kdevplatform/dependency.patch @@ -0,0 +1,12 @@ +diff --git a/plugins/filetemplates/CMakeLists.txt b/plugins/filetemplates/CMakeLists.txt +--- a/plugins/filetemplates/CMakeLists.txt ++++ b/plugins/filetemplates/CMakeLists.txt +@@ -81,6 +81,7 @@ + ) + + kde4_add_executable(testfiletemplates ${test_srcs}) ++add_dependencies(testfiletemplates kdevfiletemplates) + + target_link_libraries(testfiletemplates + ${KDE4_KDECORE_LIBS} + diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 1d585ce17fa..0f9b5b5155b 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; preConfigure = stdenv.lib.optionalString stdenv.isLinux '' - PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${systemd}/bin:$PATH + PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd ]}:$PATH substituteInPlace configure \ --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"' '' + '' @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { --replace "$out/bin" "${gettext}/bin" '' + stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $out/sbin/libvirtd \ - --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin:${numad}/bin:${numactl}/bin + --prefix PATH : ${stdenv.lib.makeBinPath [ iptables iproute pmutils numad numactl ]} ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 1fb542c2c5f..56d40f81833 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ # This flag should be picked up through pkgconfig, but it isn't. - "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" + "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include" ]; nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index e023b122091..ee332171158 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -30,8 +30,8 @@ let --with-g4install-dir=${geant4} \ --with-python-incdir=${python}/include/python${python.majorVersion} \ --with-python-libdir=${python}/lib \ - --with-boost-incdir=${boost}/include \ - --with-boost-libdir=${boost}/lib + --with-boost-incdir=${boost.dev}/include \ + --with-boost-libdir=${boost.out}/lib ''; enableParallelBuilding = true; @@ -47,24 +47,28 @@ let meta = { description = "Python bindings and utilities for Geant4"; longDescription = '' - Geant4 is a toolkit for the simulation of the passage of particles through matter. - Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science. - The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278. + Geant4 is a toolkit for the simulation of the passage of particles + through matter. Its areas of application include high energy, + nuclear and accelerator physics, as well as studies in medical and + space science. The two main reference papers for Geant4 are + published in Nuclear Instruments and Methods in Physics Research A + 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 + (2006) 270-278. ''; homepage = http://www.geant4.org; license = stdenv.lib.licenses.g4sl; maintainers = [ ]; platforms = stdenv.lib.platforms.all; - }; + }; }; fetchGeant4 = import ../fetch.nix { inherit stdenv fetchurl; - }; + }; in { v10_0_2 = buildG4py { inherit (fetchGeant4.v10_0_2) version src; geant4 = geant4.v10_0_2; - }; -} + }; +} diff --git a/pkgs/development/libraries/science/math/clblas/cuda/default.nix b/pkgs/development/libraries/science/math/clblas/cuda/default.nix index 8691009acae..c142514b262 100644 --- a/pkgs/development/libraries/science/math/clblas/cuda/default.nix +++ b/pkgs/development/libraries/science/math/clblas/cuda/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt ''; - configurePhase = '' - findInputs ${boost} boost_dirs propagated-native-build-inputs + configurePhase = '' + findInputs ${boost.dev} boost_dirs propagated-native-build-inputs export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { mkdir -p Build pushd Build - export LD_LIBRARY_PATH="${blas}/lib:${nvidia_x11}/lib" + export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [ blas nvidia_x11 ]}" cmake ../src -DCMAKE_INSTALL_PREFIX=$out \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 4461975402b..e25b23e84ed 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" "-DWT_CPP_11_MODE=-std=c++11" "-DGM_PREFIX=${graphicsmagick}" - "-DMYSQL_PREFIX=${libmysql}" + "-DMYSQL_PREFIX=${libmysql.dev}" "--no-warn-unused-cli" ]; diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 1896a615ac1..4239dc55e7c 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ - --set-rpath ${zlib.out}/lib:${ncurses.out}/lib {} \; + --set-rpath ${stdenv.lib.makeLibraryPath [ zlib ncurses ]} {} \; # fix ineffective PROGDIR / MYNDKDIR determination for i in ndk-build ndk-gdb ndk-gdb-py do diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 5e4c7e54202..36b40d5a29f 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -71,11 +71,11 @@ stdenv.mkDerivation rec { wrapProgram `pwd`/uiautomatorviewer \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]} wrapProgram `pwd`/hierarchyviewer \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]} # The emulators need additional libraries, which are dynamically loaded => let's wrap them @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { for i in emulator emulator64-arm emulator64-mips emulator64-x86 emulator64-crash-service do wrapProgram `pwd`/$i \ - --prefix PATH : ${file}/bin:${glxinfo}/bin \ + --prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \ --suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext mesa alsaLib zlib libpulseaudio ]} \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb done diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 1689b2f506f..06d38c700dd 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { sed -i \ -e 's|$(uname -m)|i686|' \ -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \ - -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${libXtst}/lib:${glib}/lib:${gtk2}/lib:./x10flasher_lib/linux/lib32|' \ + -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \ FlashTool FlashToolConsole ''; diff --git a/pkgs/development/python-modules/libgpuarray/cuda/default.nix b/pkgs/development/python-modules/libgpuarray/cuda/default.nix index 91dfb9b625b..a9c64cd7d7f 100644 --- a/pkgs/development/python-modules/libgpuarray/cuda/default.nix +++ b/pkgs/development/python-modules/libgpuarray/cuda/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { function fixRunPath { p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${cudatoolkit}/lib:${clblas}/lib:${nvidia_x11}/lib" $1 + patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ cudatoolkit clblas nvidia_x11 ]}" $1 } fixRunPath Install/lib/libgpuarray.so diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index c8be20bbe0a..d97a23746fd 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { }; preConfigure = '' - findInputs ${boost} boost_dirs propagated-native-build-inputs + findInputs ${boost.dev} boost_dirs propagated-native-build-inputs export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib diff --git a/pkgs/development/ruby-modules/gem/gem-post-build.rb b/pkgs/development/ruby-modules/gem/gem-post-build.rb index 4480c525bf1..f0322b67f61 100644 --- a/pkgs/development/ruby-modules/gem/gem-post-build.rb +++ b/pkgs/development/ruby-modules/gem/gem-post-build.rb @@ -7,7 +7,7 @@ ruby = File.join(ENV["ruby"], "bin", RbConfig::CONFIG['ruby_install_name']) out = ENV["out"] bin_path = File.join(ENV["out"], "bin") gem_home = ENV["GEM_HOME"] -gem_path = ENV["GEM_PATH"].split(":") +gem_path = ENV["GEM_PATH"].split(File::PATH_SEPARATOR) install_path = Dir.glob("#{gem_home}/gems/*").first gemspec_path = ARGV[0] @@ -64,11 +64,16 @@ spec.executables.each do |exe| # this file is here to facilitate running it. # -Gem.use_paths "#{gem_home}", #{gem_path.to_s} - require 'rubygems' -load Gem.bin_path(#{spec.name.inspect}, #{exe.inspect}) +Gem.paths = { + 'GEM_PATH' => ( + ENV['GEM_PATH'].to_s.split(File::PATH_SEPARATOR) + + #{([gem_home] + gem_path).to_s} + ).join(File::PATH_SEPARATOR) +} + +load Gem.activate_bin_path(#{spec.name.inspect}, #{exe.inspect}, #{spec.version.to_s.inspect}) EOF end diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 07cdf3fbd6d..86058e03e41 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -51,7 +51,16 @@ rec { }; }; - gradleLatest = gradleGen rec { + gradle_latest = gradleGen rec { + name = "gradle-3.0"; + + src = fetchurl { + url = "http://services.gradle.org/distributions/${name}-bin.zip"; + sha256 = "103z2nzlpc6x3mav0mqardd84rj1si718f6wpnpl8i273aa0dj9r"; + }; + }; + + gradle_2_14 = gradleGen rec { name = "gradle-2.14.1"; src = fetchurl { @@ -60,7 +69,7 @@ rec { }; }; - gradle25 = gradleGen rec { + gradle_2_5 = gradleGen rec { name = "gradle-2.5"; src = fetchurl { diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh deleted file mode 100644 index f3dd2bf2c93..00000000000 --- a/pkgs/development/tools/build-managers/leiningen/builder.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -source $stdenv/setup - -mkdir -pv $out/bin $out/share/java - -out_bin=$out/bin/lein - -cp -v $src $out_bin -cp -v $jarsrc "$out/share/java/$name-standalone.jar" - -for p in $patches; -do - patch --verbose $out_bin -p0 < $p -done -chmod -v 755 $out_bin - -patchShebangs $out - -wrapProgram $out_bin \ - --prefix PATH ":" "${rlwrap}/bin:${coreutils}/bin:${findutils}/bin" \ - --set LEIN_GPG ${gnupg1compat}/bin/gpg \ - --set JAVA_CMD ${jdk}/bin/java diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 8a8ab9ba91f..39a39f949a5 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper -, coreutils, findutils, jdk, rlwrap, gnupg1compat }: +, coreutils, jdk, rlwrap, gnupg1compat }: stdenv.mkDerivation rec { pname = "leiningen"; @@ -17,16 +17,33 @@ stdenv.mkDerivation rec { sha256 = "1533msarx6gb3xc2sp2nmspllnqy7anpnv9a0ifl0psxm3xph06p"; }; - patches = [ ./lein-fix-jar-path.patch ]; + JARNAME = "${name}-standalone.jar"; - inherit rlwrap gnupg1compat findutils coreutils jdk; - - builder = ./builder.sh; + unpackPhase = "true"; buildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ jdk ]; + installPhase = '' + mkdir -p $out/bin $out/share/java + + cp -v $src $out/bin/lein + cp -v $jarsrc $out/share/java/$JARNAME + ''; + + fixupPhase = '' + chmod +x $out/bin/lein + patchShebangs $out/bin/lein + + substituteInPlace $out/bin/lein \ + --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/java/$JARNAME" + + wrapProgram $out/bin/lein \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \ + --set LEIN_GPG ${gnupg1compat}/bin/gpg \ + --set JAVA_CMD ${jdk}/bin/java + ''; + meta = { homepage = http://leiningen.org/; description = "Project automation for Clojure"; diff --git a/pkgs/development/tools/build-managers/leiningen/lein-fix-jar-path.patch b/pkgs/development/tools/build-managers/leiningen/lein-fix-jar-path.patch deleted file mode 100644 index f7d5bc4d9a7..00000000000 --- a/pkgs/development/tools/build-managers/leiningen/lein-fix-jar-path.patch +++ /dev/null @@ -1,4 +0,0 @@ -46c47 -< LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar ---- -> LEIN_JAR=$(find $(dirname $0)/../share/java -name *-standalone.jar | head -n 1) diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix index 5a502a1fb79..8063b674766 100644 --- a/pkgs/development/tools/build-managers/redo/default.nix +++ b/pkgs/development/tools/build-managers/redo/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation rec { name = "redo-1.2"; src = fetchurl { - url = "http://homepage.ntlworld.com/jonathan.deboynepollard/Softwares/${name}.tar.bz2"; - sha256 = "0hfbiljmgl821a0sf7abrfx29f22ahrgs86mrlrm8m95s7387kpp"; + url = "https://jdebp.eu./Repository/freebsd/${name}.tar.gz"; + sha256 = "0qr8plllxfn32r4rgnalzlhcs3b4l8a4ga8ig9v8i5iy1qnfhqnf"; }; nativeBuildInputs = [ perl /* for pod2man */ ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://homepage.ntlworld.com/jonathan.deboynepollard/Softwares/redo.html; + homepage = https://jdebp.eu./Softwares/redo/; description = "A system for building target files from source files"; license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.vrthra ]; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 302026e59cc..10d4a3f0f28 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/share/bootstrap.sh \ --replace "#!/bin/bash" "#!$(type -P bash)" wrapProgram $out/bin/buildkite-agent \ - --set PATH '"${openssh}/bin/:${git}/bin:${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:$PATH"' + --set PATH '"${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}:$PATH"' ''; meta = { diff --git a/pkgs/development/tools/continuous-integration/cide/default.nix b/pkgs/development/tools/continuous-integration/cide/default.nix index 4a64d8bf303..1ed752fb393 100644 --- a/pkgs/development/tools/continuous-integration/cide/default.nix +++ b/pkgs/development/tools/continuous-integration/cide/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin makeWrapper ${env}/bin/cide $out/bin/cide \ - --set PATH ${docker}/bin:${git}/bin:${gnutar}/bin:${gzip}/bin + --set PATH ${stdenv.lib.makeBinPath [ docker git gnutar gzip ]} ''; meta = with lib; { diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 7ec56267f6b..f1a4f219682 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -9,7 +9,7 @@ let ihaskellSh = writeScriptBin "ihaskell-notebook" '' #! ${stdenv.shell} export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" - export PATH="${ihaskell}/bin:${ihaskellEnv}/bin:${ipython}/bin" + export PATH="${stdenv.lib.makeBinPath [ ihaskell ihaskellEnv ipython ]}" ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell ''; profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar"; diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index f3d88361a11..a7d6c42e6af 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/ab{put,build}-sourceforge \ - --prefix PATH ":" "${openssh}/bin:${rsync}/bin" + --prefix PATH ":" "${stdenv.lib.makeBinPath [ openssh rsync ]}" ''; meta = { diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix index 28b31cbb48d..f3bccde8160 100644 --- a/pkgs/development/tools/misc/distcc/masq.nix +++ b/pkgs/development/tools/misc/distcc/masq.nix @@ -3,10 +3,6 @@ stdenv.mkDerivation { name = "distcc-masq-${gccRaw.name}"; - meta = { - platforms = stdenv.lib.platforms.linux; - }; - phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/bin @@ -40,6 +36,9 @@ stdenv.mkDerivation { ln -sf $bbin/*-as $out/bin/as done fi - ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix index 72bbe50422c..e7c6b108cdd 100644 --- a/pkgs/development/tools/misc/drush/default.nix +++ b/pkgs/development/tools/misc/drush/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { mkdir -p "$out" cp -r . "$out/src" mkdir "$out/bin" - wrapProgram "$out/src/drush" --prefix PATH : "${which}/bin:${php}/bin:${bash}/bin:${coreutils}/bin:${ncurses.out}/bin" + wrapProgram "$out/src/drush" --prefix PATH : "${stdenv.lib.makeBinPath [ which php bash coreutils ncurses ]}" ln -s "$out/src/drush" "$out/bin/drush" ''; } diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index b533f6214f3..594bef7e16a 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -7,11 +7,15 @@ stdenv.mkDerivation rec { url = "mirror://gnu/indent/${name}.tar.gz"; sha256 = "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa"; }; - + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's|#include |#include |' ./man/texinfo2man.c + ''; + meta = { homepage = https://www.gnu.org/software/indent/; description = "A source code reformatter"; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index f3fe7e40623..3aeacd457dd 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { mv * $out/libexec/kibana/ rm -r $out/libexec/kibana/node makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ - --prefix PATH : "${nodejs}/bin:${coreutils}/bin:${which}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana ''; diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index d38c862ecfb..fa77890655e 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cp -a * $out/ substituteInPlace $out/bin/OpenGrok --replace /bin/uname ${coreutils}/bin/uname wrapProgram $out/bin/OpenGrok \ - --prefix PATH : "${ctags}/bin:${git}/bin" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \ --set JAVA_HOME "${jre}" \ --set OPENGROK_TOMCAT_BASE "/var/tomcat" ''; diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index 482d2b43df3..0a2c342e8ed 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "-I${xproto}/include/X11" "-I${libX11.dev}/include/X11" "-I${libXcursor.dev}/include/X11" - "-I${SDL}/include/SDL" + "-I${SDL.dev}/include/SDL" "-I${SDL2}/include/SDL2" ]; diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index 651278b0cf0..0ff04098057 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, mesa, zlib} : +{ stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, libpng, mesa, zlib }: let versionMajor = "0.2.8"; @@ -13,13 +13,13 @@ stdenv.mkDerivation { sha256 = "1s55irhg60fpmhy8wwxpdq7c45r1mqch6zpicyb2wf9ln60xgwnx"; }; - NIX_LDFLAGS = "-lSDL_image"; + NIX_LDFLAGS = [ "-lSDL_image" ]; - configureFlags ="--disable-etc"; - buildInputs = [SDL SDL_image libxml2 libjpeg mesa zlib]; + configureFlags = [ "--disable-etc" ]; + buildInputs = [ SDL SDL_image libxml2 libjpeg libpng mesa zlib ]; meta = with stdenv.lib; { - homepage = http://armagetronad.org; + homepage = "http://armagetronad.org"; description = "An multiplayer networked arcade racing game in 3D similar to Tron"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 12f8efd7325..b9f78ca364a 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -18,9 +18,11 @@ stdenv.mkDerivation rec { optipng imagemagick ]; - preConfigure = '' - cmakeFlags="-DDATA_DIR_PREFIXES=$out/share" - ''; + cmakeFlags = [ + "-DDATA_DIR_PREFIXES=$out/share" + "-DImageMagick_convert_EXECUTABLE=${imagemagick.out}/bin/convert" + "-DImageMagick_mogrify_EXECUTABLE=${imagemagick.out}/bin/mogrify" + ]; enableParallelBuilding = true; diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index 134e94d1fc2..73a70f2f37e 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { prePatch = '' sed -i Makefile -e 's,LIBTCODDIR=.*,LIBTCODDIR=${libtcod},g' \ - -e 's,sdl-config,${SDL}/bin/sdl-config,g' + -e 's,sdl-config,${SDL.dev}/bin/sdl-config,g' sed -i src/platform/tcod-platform.c -e "s,fonts/font,$out/share/brogue/fonts/font,g" make clean rm -rf src/libtcod* diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index a6e7c183fba..ee65bcf307e 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -1,44 +1,28 @@ { lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig -, libvorbis, libogg, mesa, boost, curl, zlib, cmake }: +, libvorbis, mesa_noglu, boost, cmake }: stdenv.mkDerivation rec { name = "commandergenius-${version}"; - version = "194beta"; + version = "1822release"; src = fetchFromGitHub { owner = "gerstrong"; repo = "Commander-Genius"; rev = "v${version}"; - sha256 = "0qxqzlmadxklrhxilbqj7y94fmbv0byj6vgpl59lb77lgs4y4x47"; + sha256 = "07vxg8p1dnnkajzs5nifxpwn4mdd1hxsw05jl25gvaimpl9p2qc8"; }; - buildInputs = [ SDL2 SDL2_image pkgconfig libvorbis libogg mesa boost curl zlib cmake ]; + buildInputs = [ SDL2 SDL2_image mesa_noglu boost libvorbis ]; - patchPhase = '' - cat >> lib/GsKit/CMakeLists.txt < + + #include "Exception.h" + #include "Util.h" diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index cf44d0e9c26..79da3f8cf9b 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ++ 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 (libmysql != null) "--with-mysql=${libmysql.dev}" ++ optional (zlib != null) "--with-zlib=${zlib.dev}" ++ optional (lzo != null) "--with-lzo=${lzo}" ++ optional (jansson != null) "--with-jansson=${jansson}" diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index d4e058d143f..5faeb926c06 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { wrapProgram $out/sbin/btrbk \ --set PERL5LIB $PERL5LIB \ - --prefix PATH ':' "${btrfs-progs}/bin:${bash}/bin/" + --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 27fc11946aa..85b4a1e1a8f 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { python setup.py install --prefix=$out wrapProgram $out/bin/duplicity \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \ - --prefix PATH : "${gnupg}/bin:${ncftp}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp ]}" wrapProgram $out/bin/rdiffdir \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" ''; diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index 9329cd23e83..80ff97f097d 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { for p in $out/bin/* do wrapProgram "$p" \ --prefix PERL5LIB ":" "${perlPackages.DBFile}/lib/perl5/site_perl" \ - --prefix PATH ":" "${which}/bin:${bzip2.bin}/bin" + --prefix PATH ":" "${stdenv.lib.makeBinPath [ which bzip2 ]}" done patchShebangs $out diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 7edf2ac3e89..6a668f77794 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { ++ lib.optional withPulseAudio libpulseaudio; postPatch = lib.optionalString withPulseAudio '' - sed -i 's,CDLL(",CDLL("${libpulseaudio}/lib/,g' blueman/main/PulseAudioUtils.py + sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py ''; pythonPath = with pythonPackages; [ dbus-python pygobject3 ]; diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index bf8cefd057e..7d4a341f555 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { cp unetbootin.desktop $out/share/applications wrapProgram $out/bin/unetbootin \ - --prefix PATH : ${which}/bin:${p7zip}/bin:${mtools}/bin + --prefix PATH : ${stdenv.lib.makeBinPath [ which p7zip mtools ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index a4184fd9514..3c43935e950 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { cp -R *.py pylrs $PYDIR wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \ - --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre.bin}/bin:${unrar}/bin:${optipng}/bin + --prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix index 40ef0b33aea..227e17347c1 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fcitx, gettext }: +{ stdenv, fetchurl, fetchpatch, cmake, fcitx, gettext }: stdenv.mkDerivation rec { name = "fcitx-table-other-${version}"; @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { buildInputs = [ cmake fcitx gettext ]; + patches = [ + (fetchpatch { url = https://sources.debian.net/data/main/f/fcitx-table-other/0.2.3-3/debian/patches/0001-table-other-fix-build.patch; + sha256 = "06n1df9szfgfjm5al8r1mvp4cib5h0cm601kwngl6k1vqyyjzg1j"; + }) + ]; + preInstall = '' substituteInPlace tables/cmake_install.cmake \ --replace ${fcitx} $out diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 8b830c257f0..8720674d3af 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -34,10 +34,12 @@ stdenv.mkDerivation rec { buildInputs = [ python3 pygobject3 intltool isocodes pkgconfig - gtk2 gtk3 dconf glib + gtk2 gtk3 dconf dbus libnotify gobjectIntrospection wayland ]; + propagatedBuildInputs = [ glib ]; + nativeBuildInputs = [ makeWrapper ]; preConfigure = '' diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index 793fb8a04d8..27bb62c582a 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/disper \ - --prefix "LD_LIBRARY_PATH" : "${xorg.libXrandr.out}/lib:${xorg.libX11.out}/lib" + --prefix "LD_LIBRARY_PATH" : "${stdenv.lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}" ''; src = fetchurl { diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 3aa2c41546b..d73def7ab9b 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { wrapProgram $out/sbin/gparted \ --prefix PATH : "${procps}/bin" wrapProgram $out/sbin/gpartedbin \ - --prefix PATH : "${gpart}/bin:${hdparm}/bin:${utillinux}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm utillinux ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 4ef8cbd757a..d1b5481ad01 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { make PREFIX="$out" install for fn in plow{del,down,list,up}; do - wrapProgram "$out/bin/$fn" --prefix PATH : "${curl.bin}/bin:${spidermonkey.out}/bin" + wrapProgram "$out/bin/$fn" --prefix PATH : "${stdenv.lib.makeBinPath [ curl spidermonkey ]}" done ''; diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index 2c1f3d77def..a55485953a8 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' PREFIX=\"\" DESTDIR=$out make install wrapProgram $out/bin/profile-cleaner \ - --prefix PATH : "${parallel}/bin:${sqlite.bin}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite ]}" ''; meta = { diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index eb9edc96bac..c3cdaffcc27 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl makeWrapper openldap bind ]; configureFlags = [ - "--with-libbind=${bind}" + "--with-libbind=${bind.dev}" "--enable-failover" "--enable-execute" "--enable-tracing" diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index bf39c36e02b..23b0d241d17 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnutls readline zlib libidn ]; configureFlags = [ - "--with-readline=${readline}" + "--with-readline=${readline.dev}" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 9a7737e0195..8a4f7e2dbe6 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -2,30 +2,21 @@ , makeWrapper, perl, openssl, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { - name = "mosh-1.2.5"; + name = "mosh-1.2.6"; src = fetchurl { - url = "http://mosh.mit.edu/${name}.tar.gz"; - sha256 = "1qsb0y882yfgwnpy6f98pi5xqm6kykdsrxzvaal37hs7szjhky0s"; + url = "https://mosh.org/${name}.tar.gz"; + sha256 = "118fhpm754wpklf1blnlq5xbvrxqml6rdfs3b07wg666zkxvg0ky"; }; buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; - patches = [ - # remove automake detection macro patch on next release as it is already on mosh master - (fetchpatch { - name = "fix_automake_detection_macro.patch"; - url = "https://github.com/mobile-shell/mosh/commit/a47917b97606a03f6bbf0cafd1fcd495b0229790.patch"; - sha256 = "0ib200ffvbnns125xd58947fyxdx31m06rmnzqmxpxcnjza7k404"; - }) - ]; - postInstall = '' wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB ''; meta = { - homepage = http://mosh.mit.edu/; + homepage = https://mosh.org/; description = "Mobile shell (ssh replacement)"; longDescription = '' Remote terminal application that allows roaming, supports intermittent diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 62a46c15bc8..7f6620af4c9 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/nm-applet" \ --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \ --prefix PATH ":" "${gnome3.gconf}/bin" wrapProgram "$out/bin/nm-connection-editor" \ - --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 8f56e07403b..564eea23184 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, sqlite3 }: pythonPackages.buildPythonApplication rec { - version = "7.0.5"; + version = "7.0.6"; name = "offlineimap-${version}"; namePrefix = ""; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "0gmypc0sribxzglxgymfc5x3saxnkyhbky06dhxanxm6pa1p4blh"; + sha256 = "14hmr4f9zv1hhl6azh78rg4csincxzkp1sl4wydd4gwyb74cfpkc"; }; doCheck = false; diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index 748f41c9053..706f2434a95 100644 --- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress wrapProgram $out/libexec/openvpn/openvpn-learnaddress \ - --prefix PATH : ${coreutils}/bin:${gawk}/bin:${utillinux}/bin + --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk utillinux ]} ''; meta = { diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index f6b11580598..3b405561ef9 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { done # We need a way to pass $PATH to the scripts - sed -i '2iexport PATH=${git}/bin:${mariadb}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc - sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc + sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mariadb which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc + sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git coreutils diffutils nettools ]}' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc ''; installPhase = '' diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 40acfaf323a..59bbd918d64 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default - sed -i "2iexport PATH=${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin\$\{PATH:+:\}\$PATH" in/scripts=wicd.in + sed -i "2iexport PATH=${stdenv.lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index b1a3fc85849..c8315d0c3f5 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchgit, openssl }: +{ stdenv, fetchFromGitHub, openssl, perl }: -let - version = "4.0.0"; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "wrk-${version}"; + version = "4.0.2"; - src = fetchgit { - url = "https://github.com/wg/wrk.git"; - rev = "7cdede916a53da253c995767a92eec36a245a2cc"; - sha256 = "1zk7mx27875wkbwcjpbl9zmpyyfic9177wmkif9a16mvj7mvlw9v"; + src = fetchFromGitHub { + owner = "wg"; + repo = "wrk"; + rev = version; + sha256 = "1qg6w8xz4pr227h1gxrbm6ylhqvspk95hvq2f9iakni7s56pkh1w"; }; - buildInputs = [ openssl ]; + buildInputs = [ openssl perl ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix index 57352f99091..ab041c8b05d 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.out}/bin:${curl.bin}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ xawtv imagemagick curl scrot inetutils coreutils ]}" \ --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt" ''; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index c428fb07fac..b0c6b073029 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -52,7 +52,8 @@ stdenv.mkDerivation rec { stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++ stdenv.lib.optional (python != null) "--with-python=${python}/bin/python"; - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + # Fix build on Glibc 2.24. + NIX_CFLAGS_COMPILE = "-Wno-error=cpp -Wno-error=deprecated-declarations"; meta = with stdenv.lib; { description = "Daemon which collects system performance statistics periodically"; diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix index d66d4b57578..c1c62718de2 100644 --- a/pkgs/tools/system/wsmancli/default.nix +++ b/pkgs/tools/system/wsmancli/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ./bootstrap configureFlagsArray=( - LIBS="-L${openssl}/lib -lssl -lcrypto" + LIBS="-L${openssl.out}/lib -lssl -lcrypto" ) ''; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index d9d69a4a4c0..59059c632b9 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -235,7 +235,7 @@ stdenv.mkDerivation rec { # use it to work around an impurity in the tetex package; tetex tools # cannot find their neighbours (e.g. pdflatex doesn't find mktextfm). # We can remove PATH= when those impurities are fixed. - sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook5_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${tetex}/bin:${coreutils}/bin:${gnused}/bin')|" \ + sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook5_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ tetex coreutils gnused ]}')|" \ -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \ -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \ -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \ diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index a426356a09f..ce8a60dca86 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -p djvu2pdf $out/bin - wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre.bin}/bin:${which}/bin + wrapProgram $out/bin/djvu2pdf --prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript djvulibre which ]} mkdir -p $out/man/man1 cp -p djvu2pdf.1.gz $out/man/man1 diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix index 90b2ff61f34..029227cd118 100644 --- a/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -i "s|/usr/share/docbook2odf|$out/share/docbook2odf|" "$out/bin/docbook2odf" wrapProgram "$out/bin/docbook2odf" \ - --prefix PATH : "${zip}/bin:${libxslt}/bin" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ zip libxslt ]}" \ --prefix PERL5PATH : "${stdenv.lib.makePerlPath [PerlMagick]}" ''; diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 2ed846cb070..ed3dad64f16 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xmlto" \ - --prefix PATH : "${libxslt.bin}/bin:${libxml2.bin}/bin:${getopt}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ libxslt libxml2 getopt ]}" # `w3m' is needed for HTML to text conversions. substituteInPlace "$out/share/xmlto/format/docbook/txt" \ diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 489b67f483b..0e90a5071b7 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ libdv libjpeg libpng pkgconfig ] ++ lib.optional (!withMinimal) [ gtk libX11 SDL SDL_gfx ]; + NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL}/include/SDL"; + postPatch = '' sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure ''; diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index 6ccce4684ad..edb3d6add16 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { for i in $out/bin/*; do wrapProgram $i \ --set EC2_HOME $out \ - --prefix PATH : ${ruby}/bin:${openssl.bin}/bin + --prefix PATH : ${stdenv.lib.makeBinPath [ ruby openssl ]} done sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 925e429f712..ec1df4cf166 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -30,6 +30,7 @@ doNotDisplayTwice rec { bundler_HEAD = bundler; # added 2015-11-15 checkbashism = checkbashisms; # added 2016-08-16 cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 + cifs_utils = cifs-utils; # added 2016-08 clangAnalyzer = clang-analyzer; # added 2015-02-20 clawsMail = claws-mail; # added 2016-04-29 conkerorWrapper = conkeror; # added 2015-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 616dca8acd1..cb52a44e5db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4780,10 +4780,14 @@ in openjdk = if stdenv.isDarwin then self.openjdk7 else self.openjdk8; jdk7 = self.openjdk7 // { outputs = [ "out" ]; }; - jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" (self.openjdk7.jre // { outputs = [ "jre" ]; }); + jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" + (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } + (self.openjdk7.jre // { outputs = [ "jre" ]; })); jdk8 = self.openjdk8 // { outputs = [ "out" ]; }; - jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (self.openjdk8.jre // { outputs = [ "jre" ]; }); + jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" + (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } + (self.openjdk8.jre // { outputs = [ "jre" ]; })); jdk = if stdenv.isDarwin then self.jdk7 else self.jdk8; jre = if stdenv.isDarwin then self.jre7 else self.jre8; @@ -6419,8 +6423,9 @@ in gotty = callPackage ../servers/gotty { }; gradleGen = callPackage ../development/tools/build-managers/gradle { }; - gradle = self.gradleGen.gradleLatest; - gradle25 = self.gradleGen.gradle25; + gradle = self.gradleGen.gradle_latest; + gradle_2_14 = self.gradleGen.gradle_2_14; + gradle_2_5 = self.gradleGen.gradle_2_5; gperf = callPackage ../development/tools/misc/gperf { }; @@ -8861,7 +8866,8 @@ in oniguruma = callPackage ../development/libraries/oniguruma { }; - openal = openalSoft; + openal = self.openalSoft; + openalSoft = callPackage ../development/libraries/openal-soft { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; @@ -9290,9 +9296,7 @@ in openglSupport = mesaSupported; alsaSupport = stdenv.isLinux; x11Support = !stdenv.isCygwin; - pulseaudioSupport = if (config ? pulseaudio) - then config.pulseaudio - else stdenv.isLinux; + pulseaudioSupport = config.pulseaudio or stdenv.isLinux; inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa; }; @@ -9316,7 +9320,8 @@ in openglSupport = mesaSupported; alsaSupport = stdenv.isLinux; x11Support = !stdenv.isCygwin; - pulseaudioSupport = config.pulseaudio or false; # better go through ALSA + udevSupport = stdenv.isLinux; + pulseaudioSupport = config.pulseaudio or stdenv.isLinux; inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; @@ -10767,7 +10772,7 @@ in checksec = callPackage ../os-specific/linux/checksec { }; - cifs_utils = callPackage ../os-specific/linux/cifs-utils { }; + cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_1; # conky can use 5.2, but toluapp can not @@ -15099,6 +15104,10 @@ in libva = libva-full; # also wants libva-x11 }; + vlc_npapi = callPackage ../applications/video/vlc/plugin.nix { + gtk = gtk2; + }; + vlc_qt5 = qt5.vlc; vmpk = callPackage ../applications/audio/vmpk { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index a0d340826f5..e8af3c2dbf9 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -28,14 +28,14 @@ let imagick31 = assert !isPhp7; buildPecl { name = "imagick-3.1.2"; sha256 = "14vclf2pqcgf3w8nzqbdw0b9v30q898344c84jdbw2sa62n6k1sj"; - configureFlags = "--with-imagick=${pkgs.imagemagick}"; + configureFlags = "--with-imagick=${pkgs.imagemagick.dev}"; buildInputs = [ pkgs.pkgconfig ]; }; imagick34 = buildPecl { name = "imagick-3.4.0RC4"; sha256 = "0fdkzdv3r8sm6y1x11kp3rxsimq6zf15xvi0mhn57svmnan4zh0i"; - configureFlags = "--with-imagick=${pkgs.imagemagick}"; + configureFlags = "--with-imagick=${pkgs.imagemagick.dev}"; buildInputs = [ pkgs.pkgconfig ]; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac7a4cc7bc5..177607098ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22837,7 +22837,7 @@ in modules // { checkPhase = '' cd tests - export MAGICK_HOME="${pkgs.imagemagick}" + export MAGICK_HOME="${pkgs.imagemagick.dev}" export PYTHONPATH=$PYTHONPATH:../ py.test cd ..