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

2016-07-19 10:37:02 +00:00
parent 6539901c7f b54009fdfb
commit 203846b9de
282 changed files with 4189 additions and 7149 deletions
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec{
  buildInputs = [ zlib libpng pkgconfig qt4 qmake4Hook ]
                ++ (if withGamepads then [ SDL ] else [ ]);

+  qmakeFlags = [ "PPSSPPQt.pro" ];
+
  preConfigure = "cd Qt";
  installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin";