Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/misc/emulators/dosbox/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL, makeDesktopItem }:
+{ stdenv, fetchurl, SDL, makeDesktopItem, mesa }:
 
 stdenv.mkDerivation rec { 
   name = "dosbox-0.74";
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
 
   patchFlags = "-p0";
 
-  buildInputs = [ SDL ];
-
   hardeningDisable = [ "format" ];
 
+  buildInputs = [ SDL mesa ];
+
   desktopItem = makeDesktopItem {
     name = "dosbox";
     exec = "dosbox";

pkgs/misc/emulators/ppsspp/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, zlib, libpng, qt4, pkgconfig
+{ stdenv, fetchgit, zlib, libpng, qt4, qmake4Hook, pkgconfig
 , withGamepads ? true, SDL # SDL is used for gamepad functionality
 }:
 
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec{
     sha256 = "71dfa0be045f31969b1d6ab4f1adf6a208f9ef4834d708bc7bf6d9195efb5f80";
   };
 
-  buildInputs = [ zlib libpng pkgconfig qt4 ]
+  buildInputs = [ zlib libpng pkgconfig qt4 qmake4Hook ]
                 ++ (if withGamepads then [ SDL ] else [ ]);
 
-  configurePhase = "cd Qt && qmake PPSSPPQt.pro";
+  preConfigure = "cd Qt";
   installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin";
 
   meta = {

pkgs/misc/emulators/wine/base.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   NIX_LDFLAGS = map (path: "-rpath " + path) (
       map (x: "${x}/lib") ([ stdenv.cc.cc ] ++ (map (x: x.lib or x.out) buildInputs))
       # libpulsecommon.so is linked but not found otherwise
-      ++ lib.optionals pulseaudioSupport (map (x: "${x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))
+      ++ lib.optionals pulseaudioSupport (map (x: "${x.lib or x.out}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))
     );
 
   # Don't shrink the ELF RPATHs in order to keep the extra RPATH