Merge master into staging-next

2019-11-14 13:31:39 +01:00
parent f799388550 c747894638
commit c6e31d0767
212 changed files with 6404 additions and 2952 deletions
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qtmultimedia
+{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qtmultimedia
 , glew, libzip, snappy, zlib, withGamepads ? true, SDL2 }:

 assert withGamepads -> (SDL2 != null);
 with stdenv.lib;

-stdenv.mkDerivation rec {
+mkDerivation rec {
  pname = "ppsspp";
  version = "1.4.2";