mednaffe: GTK3, correct license, find mednafen w/o patching source

This commit is contained in:
Yegor Timoshenko 2017-09-30 16:32:56 +00:00
parent d7d774deea
commit e1cc156f72
2 changed files with 15 additions and 12 deletions

View File

@ -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 { stdenv.mkDerivation rec {
name = "mednaffe-${version}"; name = "mednaffe-${version}";
@ -11,19 +14,17 @@ stdenv.mkDerivation rec {
sha256 = "13l7gls430dcslpan39k0ymdnib2v6crdsmn6bs9k9g30nfnqi6m"; sha256 = "13l7gls430dcslpan39k0ymdnib2v6crdsmn6bs9k9g30nfnqi6m";
}; };
patchPhase = '' nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig wrapGAppsHook ];
substituteInPlace src/mednaffe.c \ buildInputs = [ gtk2 gtk3 mednafen ];
--replace 'binpath = NULL' 'binpath = "${mednafen}/bin/mednafen"'
'';
nativeBuildInputs = [ autoreconfHook pkgconfig ]; configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ];
buildInputs = [ gtk2 mednafen ]; postInstall = "wrapProgram $out/bin/mednaffe --set PATH ${mednafen}/bin";
meta = with stdenv.lib; { meta = {
description = "A GTK based frontend for mednafen"; description = "GTK-based frontend for mednafen emulator";
homepage = https://github.com/AmatCoder/mednaffe; homepage = https://github.com/AmatCoder/mednaffe;
license = licenses.gpl3; license = licenses.gpl3Plus;
maintainers = with maintainers; [ sheenobu ]; maintainers = with maintainers; [ sheenobu yegortimoshenko ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -3265,7 +3265,9 @@ with pkgs;
mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; 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 { }; megacli = callPackage ../tools/misc/megacli { };