From e1cc156f721a130101b4adb2c6b772b51a09821a Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 30 Sep 2017 16:32:56 +0000 Subject: [PATCH] mednaffe: GTK3, correct license, find mednafen w/o patching source --- pkgs/misc/emulators/mednaffe/default.nix | 23 ++++++++++++----------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index a72192b1fcfc..c62d9c90ca79 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, mednafen }: +{ stdenv, fetchFromGitHub, makeWrapper, autoreconfHook, pkgconfig, wrapGAppsHook +, gtk2 ? null, gtk3 ? null, mednafen }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "mednaffe-${version}"; @@ -11,19 +14,17 @@ stdenv.mkDerivation rec { sha256 = "13l7gls430dcslpan39k0ymdnib2v6crdsmn6bs9k9g30nfnqi6m"; }; - patchPhase = '' - substituteInPlace src/mednaffe.c \ - --replace 'binpath = NULL' 'binpath = "${mednafen}/bin/mednafen"' - ''; + nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig wrapGAppsHook ]; + buildInputs = [ gtk2 gtk3 mednafen ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gtk2 mednafen ]; + configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ]; + postInstall = "wrapProgram $out/bin/mednaffe --set PATH ${mednafen}/bin"; - meta = with stdenv.lib; { - description = "A GTK based frontend for mednafen"; + meta = { + description = "GTK-based frontend for mednafen emulator"; homepage = https://github.com/AmatCoder/mednaffe; - license = licenses.gpl3; - maintainers = with maintainers; [ sheenobu ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ sheenobu yegortimoshenko ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da57a8eda064..fc06c48ae49d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3265,7 +3265,9 @@ with pkgs; mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; - mednaffe = callPackage ../misc/emulators/mednaffe/default.nix { }; + mednaffe = callPackage ../misc/emulators/mednaffe/default.nix { + gtk2 = null; + }; megacli = callPackage ../tools/misc/megacli { };