Merge master into staging-next

2019-11-25 21:51:57 +01:00
parent 2a2d3de78c 646b279c55
commit 06a054e6eb
252 changed files with 3160 additions and 2290 deletions
@@ -1,14 +1,8 @@
 { stdenv, lib, makeWrapper, retroarch, cores }:

-let
-
-  p = builtins.parseDrvName retroarch.name;
-
-in
-
 stdenv.mkDerivation {
-  name = "retroarch-" + p.version;
-  version = p.version;
+  pname = "retroarch";
+  version = lib.getVersion retroarch;

  buildInputs = [ makeWrapper ];