diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2022-12-28 17:28:39 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-28 17:28:39 -0300 |
| commit | 8841ea8f267ab3a8792e846ae115893d4ffaa89a (patch) | |
| tree | da36d267f5f551abe9508e1b39a8414495bf3560 | |
| parent | 590321a5defbbabe96f8def70013d5b45406dee4 (diff) | |
| parent | 76aaf902a52f3df46d4f7852627c9603251eee63 (diff) | |
Merge pull request #207925 from wegank/bsnes-hd-darwin
bsnes-hd: unbreak on x86_64-darwin
| -rw-r--r-- | pkgs/applications/emulators/bsnes/bsnes-hd/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 17 insertions, 11 deletions
diff --git a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix index 6410189699493..b6d158a7a7c83 100644 --- a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix +++ b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix @@ -6,9 +6,12 @@ , SDL2 , gtk3, gtksourceview3 , alsa-lib, libao, openal, libpulseaudio -, libicns, Cocoa, OpenAL +, libicns, makeWrapper, darwin }: +let + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa OpenAL; +in stdenv.mkDerivation { pname = "bsnes-hd"; version = "10.6-beta"; @@ -35,8 +38,9 @@ stdenv.mkDerivation { ./macos-copy-app-to-prefix.patch ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook ] - ++ lib.optionals stdenv.isDarwin [ libicns ]; + nativeBuildInputs = [ pkg-config ] + ++ lib.optionals stdenv.isLinux [ wrapGAppsHook ] + ++ lib.optionals stdenv.isDarwin [ libicns makeWrapper ]; buildInputs = [ SDL2 libao ] ++ lib.optionals stdenv.isLinux [ libX11 libXv udev gtk3 gtksourceview3 alsa-lib openal libpulseaudio ] @@ -44,10 +48,17 @@ stdenv.mkDerivation { enableParallelBuilding = true; - makeFlags = [ "-C" "bsnes" "hiro=gtk3" "prefix=$(out)" ]; + makeFlags = [ "-C" "bsnes" "prefix=$(out)" ] + ++ lib.optionals stdenv.isLinux [ "hiro=gtk3" ] + ++ lib.optionals stdenv.isDarwin [ "hiro=cocoa" ]; + + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/bin + makeWrapper $out/{Applications/bsnes.app/Contents/MacOS,bin}/bsnes + ''; # https://github.com/bsnes-emu/bsnes/issues/107 - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' gappsWrapperArgs+=( --prefix GDK_BACKEND : x11 ) @@ -59,9 +70,6 @@ stdenv.mkDerivation { license = licenses.gpl3Only; maintainers = with maintainers; [ stevebob ]; platforms = platforms.unix; - # ../nall/traits.hpp:19:14: error: no member named 'is_floating_point_v' in namespace 'std'; did you mean 'is_floating_point'? - # using std::is_floating_point_v; - broken = (stdenv.isDarwin && stdenv.isx86_64); mainProgram = "bsnes"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05c320c8e0931..23a163d95d271 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2175,9 +2175,7 @@ with pkgs; ares = darwin.apple_sdk_11_0.callPackage ../applications/emulators/bsnes/ares { }; - bsnes-hd = callPackage ../applications/emulators/bsnes/bsnes-hd { - inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; - }; + bsnes-hd = darwin.apple_sdk_11_0.callPackage ../applications/emulators/bsnes/bsnes-hd { }; higan = callPackage ../applications/emulators/bsnes/higan { }; |