Merge pull request #173607 from SuperSamus/bsnes-gtk

bsnes-hd: use gtk3

Sandro 3804b963 5a5ab1ef

Changed files
+13 -5
pkgs
applications
emulators
bsnes
bsnes-hd
top-level
+13 -4
pkgs/applications/emulators/bsnes/bsnes-hd/default.nix
···
{ lib, stdenv, fetchFromGitHub
, pkg-config
+
, wrapGAppsHook
, libX11, libXv
, udev
, SDL2
-
, gtk2, gtksourceview
+
, gtk3, gtksourceview3
, alsa-lib, libao, openal, libpulseaudio
, libicns, Cocoa, OpenAL
}:
···
./macos-copy-app-to-prefix.patch
];
-
nativeBuildInputs = [ pkg-config ]
+
nativeBuildInputs = [ pkg-config wrapGAppsHook ]
++ lib.optionals stdenv.isDarwin [ libicns ];
buildInputs = [ SDL2 libao ]
-
++ lib.optionals stdenv.isLinux [ libX11 libXv udev gtk2 gtksourceview alsa-lib openal libpulseaudio ]
+
++ lib.optionals stdenv.isLinux [ libX11 libXv udev gtk3 gtksourceview3 alsa-lib openal libpulseaudio ]
++ lib.optionals stdenv.isDarwin [ Cocoa OpenAL ];
enableParallelBuilding = true;
-
makeFlags = [ "-C" "bsnes" "prefix=$(out)" ];
+
makeFlags = [ "-C" "bsnes" "hiro=gtk3" "prefix=$(out)" ];
+
+
# https://github.com/bsnes-emu/bsnes/issues/107
+
preFixup = ''
+
gappsWrapperArgs+=(
+
--prefix GDK_BACKEND : x11
+
)
+
'';
meta = with lib; {
description = "A fork of bsnes that adds HD video features";
···
license = licenses.gpl3Only;
maintainers = with maintainers; [ stevebob ];
platforms = platforms.unix;
+
mainProgram = "bsnes";
};
}
-1
pkgs/top-level/all-packages.nix
···
ares = callPackage ../applications/emulators/bsnes/ares { };
bsnes-hd = callPackage ../applications/emulators/bsnes/bsnes-hd {
-
inherit (gnome2) gtksourceview;
inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL;
};