Merge branch 'master' into staging

... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
parent 21df05d1ad 8fbdb40ef0
commit 81039713fa
239 changed files with 14833 additions and 1959 deletions
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  };

  prePatch = ''
-    substituteInPlace src/mednaffe.c --replace "binpath = NULL" "binpath = \"${mednafen}/bin/mednafen\""
+    substituteInPlace src/mednaffe.c --replace "binpath = NULL" "binpath = g_strdup( \"${mednafen}/bin/mednafen\" )"
  '';

  buildInputs = [ pkgconfig gtk2 mednafen ];