diff options
| author | Bobby Rong <rjl931189261@126.com> | 2021-12-18 19:03:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-18 19:03:48 +0800 |
| commit | 058f304d41966672be66efd978210b9ec8c81687 (patch) | |
| tree | 9ab4719593b559026ad803eee1885f7634974ad5 | |
| parent | Merge pull request #151172 from NixOS/backport-151150-to-release-21.11 (diff) | |
| parent | mednaffe: remove gtk2 (diff) | |
| download | nixpkgs-058f304d41966672be66efd978210b9ec8c81687.tar.gz | |
Merge pull request #151175 from NixOS/backport-150974-to-release-21.11
[Backport release-21.11] mednaffe: remove gtk2
| -rw-r--r-- | pkgs/misc/emulators/mednaffe/default.nix | 12 | ||||
| -rw-r--r-- | 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 { }; |