git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #154702 from AndersonTorres/new-misc

higan: mark as broken on Darwin

commit44f40b84aa5354a7fb0e14f2a09b3cca8831a6a9 authorAnderson Torres <torres.anderson.85@protonmail.com> dateWed 12 Jan 2022, 12:00 (5 years ago) parent25e18005d5d787
2 files changed+6−9
compare with master
unifiedsplit
pkgs/misc/emulators/higan/default.nix+5−6 pkgs/top-level/all-packages.nix+1−3
pkgs/misc/emulators/higan/default.nix+5−6
@@ -17,10 +17,7 @@
1717, udev
1818# Darwin dependencies
1919, libicns
20−, Carbon
21−, Cocoa
22−, OpenAL
23−, OpenGL
20+, darwin
2421}:
2522
2623stdenv.mkDerivation rec {
@@ -54,12 +51,13 @@ stdenv.mkDerivation rec {
5451 libpulseaudio
5552 openal
5653 udev
57− ] ++ lib.optionals stdenv.isDarwin [
54+ ]
55+ ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
5856 Carbon
5957 Cocoa
6058 OpenAL
6159 OpenGL
62− ];
60+ ]);
6361
6462 patches = [
6563 # Includes cmath header
@@ -151,6 +149,7 @@ stdenv.mkDerivation rec {
151149 license = licenses.gpl3Plus;
152150 maintainers = with maintainers; [ AndersonTorres ];
153151 platforms = platforms.unix;
152+ broken = stdenv.isDarwin;
154153 };
155154}
156155# TODO: select between Qt, GTK2 and GTK3
pkgs/top-level/all-packages.nix+1−3
@@ -33938,9 +33938,7 @@ with pkgs;
3393833938 python = python3;
3393933939 };
3394033940
33941− higan = callPackage ../misc/emulators/higan {
33942− inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL;
33943− };
33941+ higan = callPackage ../misc/emulators/higan { };
3394433942
3394533943 bsnes-hd = callPackage ../misc/emulators/bsnes-hd {
3394633944 inherit (gnome2) gtksourceview;