From 1a4ec50e7dd136fe2affb46cfa4436d171129130 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Fri, 17 Dec 2021 01:02:05 +1000 Subject: [PATCH] mednaffe: remove gtk2 Upstream has removed support for it. (cherry picked from commit c061809b07fdddd5db20ff789adf95e62f6f947a) --- pkgs/misc/emulators/mednaffe/default.nix | 12 +++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index e92836ae34d5..c8363b8d6041 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -4,8 +4,7 @@ , autoreconfHook , pkg-config , mednafen -, gtk2 ? null -, gtk3 ? null +, gtk3 , wrapGAppsHook }: @@ -21,16 +20,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; - buildInputs = [ gtk2 gtk3 mednafen ]; - - configureFlags = [ (lib.enableFeature (gtk3 != null) "gtk3") ]; - - dontWrapGApps = true; + buildInputs = [ gtk3 mednafen ]; postInstall = '' wrapProgram $out/bin/mednaffe \ - --prefix PATH ':' "${mednafen}/bin" \ - "''${gappsWrapperArgs[@]}" + --prefix PATH ':' "${mednafen}/bin" ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 254052c0838c..01f9bdcef9fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7548,9 +7548,7 @@ with pkgs; mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; - mednaffe = callPackage ../misc/emulators/mednaffe { - gtk2 = null; - }; + mednaffe = callPackage ../misc/emulators/mednaffe { }; megacli = callPackage ../tools/misc/megacli { };