diff options
author | Zane van Iperen <zane@zanevaniperen.com> | 2021-12-17 01:02:05 +1000 |
---|---|---|
committer | ehmry <ehmry@posteo.net> | 2021-12-18 10:15:33 +0000 |
commit | cef1694515c38c882a3cf23e0cb763495b6d2b95 (patch) | |
tree | e229de59f80ff7238f1fe139a6203fd607f54cff | |
parent | 3017da1633f1974043657361ef1e540fee0337ee (diff) | |
download | nixpkgs-cef1694515c38c882a3cf23e0cb763495b6d2b95.tar nixpkgs-cef1694515c38c882a3cf23e0cb763495b6d2b95.tar.gz nixpkgs-cef1694515c38c882a3cf23e0cb763495b6d2b95.tar.bz2 nixpkgs-cef1694515c38c882a3cf23e0cb763495b6d2b95.tar.lz nixpkgs-cef1694515c38c882a3cf23e0cb763495b6d2b95.tar.xz nixpkgs-cef1694515c38c882a3cf23e0cb763495b6d2b95.tar.zst nixpkgs-cef1694515c38c882a3cf23e0cb763495b6d2b95.zip |
mednaffe: remove gtk2
Upstream has removed support for it.
-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 e92836ae34d..c8363b8d604 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 f9b01ebc4be..6f11b149463 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7674,9 +7674,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 { }; |