diff --git a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix index 6494185958c..edb397a49d3 100644 --- a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix +++ b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchFromGitHub , pkg-config +, wrapGAppsHook , libX11, libXv , udev , SDL2 -, gtk2, gtksourceview +, gtk3, gtksourceview3 , alsa-lib, libao, openal, libpulseaudio , libicns, Cocoa, OpenAL }: @@ -34,16 +35,23 @@ stdenv.mkDerivation { ./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"; @@ -51,5 +59,6 @@ stdenv.mkDerivation { license = licenses.gpl3Only; maintainers = with maintainers; [ stevebob ]; platforms = platforms.unix; + mainProgram = "bsnes"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ed5cb972ce..0d763d9f5d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1428,7 +1428,6 @@ with pkgs; ares = callPackage ../applications/emulators/bsnes/ares { }; bsnes-hd = callPackage ../applications/emulators/bsnes/bsnes-hd { - inherit (gnome2) gtksourceview; inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; };