summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-09-29 00:38:41 +0100
committerGitHub <noreply@github.com>2017-09-29 00:38:41 +0100
commitea130491954f689f4e408e23a061630b21ca92a9 (patch)
tree96b860d7b1059d06ce81006e0c01137e20f50ff4
parentebe52a7c548d50ebeb59ab5af00da3956dba7760 (diff)
parent6e4c9b62946d8dae0ec012c4fd1b3d7f44b5b995 (diff)
downloadnixlib-ea130491954f689f4e408e23a061630b21ca92a9.tar
nixlib-ea130491954f689f4e408e23a061630b21ca92a9.tar.gz
nixlib-ea130491954f689f4e408e23a061630b21ca92a9.tar.bz2
nixlib-ea130491954f689f4e408e23a061630b21ca92a9.tar.lz
nixlib-ea130491954f689f4e408e23a061630b21ca92a9.tar.xz
nixlib-ea130491954f689f4e408e23a061630b21ca92a9.tar.zst
nixlib-ea130491954f689f4e408e23a061630b21ca92a9.zip
Merge pull request #29855 from yegortimoshenko/mednaffe/0.8.6
mednaffe: 0.8 -> 0.8.6, drop autoreconfHook, drop g_strdup() from patch
-rw-r--r--pkgs/misc/emulators/mednaffe/default.nix23
1 files changed, 12 insertions, 11 deletions
diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix
index 21e75a72d61c..a72192b1fcfc 100644
--- a/pkgs/misc/emulators/mednaffe/default.nix
+++ b/pkgs/misc/emulators/mednaffe/default.nix
@@ -1,28 +1,29 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gtk2, mednafen }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, mednafen }:
 
 stdenv.mkDerivation rec {
-
-  version = "0.8";
   name = "mednaffe-${version}";
+  version = "0.8.6";
 
   src = fetchFromGitHub {
-	repo = "mednaffe";
-	owner = "AmatCoder";
-	rev = "v${version}";
-	sha256 = "1j4py4ih14fa6dv0hka03rs4mq19ir83qkbxsz3695a4phmip0jr";
+    owner = "AmatCoder";
+    repo = "mednaffe";
+    rev = "v${version}";
+    sha256 = "13l7gls430dcslpan39k0ymdnib2v6crdsmn6bs9k9g30nfnqi6m";
   };
 
-  prePatch = ''
-    substituteInPlace src/mednaffe.c --replace "binpath = NULL" "binpath = g_strdup( \"${mednafen}/bin/mednafen\" )"
+  patchPhase = ''
+    substituteInPlace src/mednaffe.c \
+      --replace 'binpath = NULL' 'binpath = "${mednafen}/bin/mednafen"'
   '';
 
-  buildInputs = [ pkgconfig gtk2 mednafen ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ gtk2 mednafen ];
 
   meta = with stdenv.lib; {
     description = "A GTK based frontend for mednafen";
     homepage = https://github.com/AmatCoder/mednaffe;
     license = licenses.gpl3;
-    maintainers = [ maintainers.sheenobu ];
+    maintainers = with maintainers; [ sheenobu ];
     platforms = platforms.linux;
   };
 }