bsnes-hd: unbreak on x86_64-darwin

+17 -11
+16 -8
pkgs/applications/emulators/bsnes/bsnes-hd/default.nix
··· 6 , SDL2 7 , gtk3, gtksourceview3 8 , alsa-lib, libao, openal, libpulseaudio 9 - , libicns, Cocoa, OpenAL 10 }: 11 12 stdenv.mkDerivation { 13 pname = "bsnes-hd"; 14 version = "10.6-beta"; ··· 35 ./macos-copy-app-to-prefix.patch 36 ]; 37 38 - nativeBuildInputs = [ pkg-config wrapGAppsHook ] 39 - ++ lib.optionals stdenv.isDarwin [ libicns ]; 40 41 buildInputs = [ SDL2 libao ] 42 ++ lib.optionals stdenv.isLinux [ libX11 libXv udev gtk3 gtksourceview3 alsa-lib openal libpulseaudio ] ··· 44 45 enableParallelBuilding = true; 46 47 - makeFlags = [ "-C" "bsnes" "hiro=gtk3" "prefix=$(out)" ]; 48 49 # https://github.com/bsnes-emu/bsnes/issues/107 50 - preFixup = '' 51 gappsWrapperArgs+=( 52 --prefix GDK_BACKEND : x11 53 ) ··· 59 license = licenses.gpl3Only; 60 maintainers = with maintainers; [ stevebob ]; 61 platforms = platforms.unix; 62 - # ../nall/traits.hpp:19:14: error: no member named 'is_floating_point_v' in namespace 'std'; did you mean 'is_floating_point'? 63 - # using std::is_floating_point_v; 64 - broken = (stdenv.isDarwin && stdenv.isx86_64); 65 mainProgram = "bsnes"; 66 }; 67 }
··· 6 , SDL2 7 , gtk3, gtksourceview3 8 , alsa-lib, libao, openal, libpulseaudio 9 + , libicns, makeWrapper, darwin 10 }: 11 12 + let 13 + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa OpenAL; 14 + in 15 stdenv.mkDerivation { 16 pname = "bsnes-hd"; 17 version = "10.6-beta"; ··· 38 ./macos-copy-app-to-prefix.patch 39 ]; 40 41 + nativeBuildInputs = [ pkg-config ] 42 + ++ lib.optionals stdenv.isLinux [ wrapGAppsHook ] 43 + ++ lib.optionals stdenv.isDarwin [ libicns makeWrapper ]; 44 45 buildInputs = [ SDL2 libao ] 46 ++ lib.optionals stdenv.isLinux [ libX11 libXv udev gtk3 gtksourceview3 alsa-lib openal libpulseaudio ] ··· 48 49 enableParallelBuilding = true; 50 51 + makeFlags = [ "-C" "bsnes" "prefix=$(out)" ] 52 + ++ lib.optionals stdenv.isLinux [ "hiro=gtk3" ] 53 + ++ lib.optionals stdenv.isDarwin [ "hiro=cocoa" ]; 54 + 55 + postInstall = lib.optionalString stdenv.isDarwin '' 56 + mkdir -p $out/bin 57 + makeWrapper $out/{Applications/bsnes.app/Contents/MacOS,bin}/bsnes 58 + ''; 59 60 # https://github.com/bsnes-emu/bsnes/issues/107 61 + preFixup = lib.optionalString stdenv.isLinux '' 62 gappsWrapperArgs+=( 63 --prefix GDK_BACKEND : x11 64 ) ··· 70 license = licenses.gpl3Only; 71 maintainers = with maintainers; [ stevebob ]; 72 platforms = platforms.unix; 73 mainProgram = "bsnes"; 74 }; 75 }
+1 -3
pkgs/top-level/all-packages.nix
··· 2175 2176 ares = darwin.apple_sdk_11_0.callPackage ../applications/emulators/bsnes/ares { }; 2177 2178 - bsnes-hd = callPackage ../applications/emulators/bsnes/bsnes-hd { 2179 - inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; 2180 - }; 2181 2182 higan = callPackage ../applications/emulators/bsnes/higan { }; 2183
··· 2175 2176 ares = darwin.apple_sdk_11_0.callPackage ../applications/emulators/bsnes/ares { }; 2177 2178 + bsnes-hd = darwin.apple_sdk_11_0.callPackage ../applications/emulators/bsnes/bsnes-hd { }; 2179 2180 higan = callPackage ../applications/emulators/bsnes/higan { }; 2181