Merge pull request #154702 from AndersonTorres/new-misc

higan: mark as broken on Darwin
This commit is contained in:
Anderson Torres 2022-01-12 12:00:38 -03:00 committed by GitHub
commit 44f40b84aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions

View file

@ -17,10 +17,7 @@
, udev
# Darwin dependencies
, libicns
, Carbon
, Cocoa
, OpenAL
, OpenGL
, darwin
}:
stdenv.mkDerivation rec {
@ -54,12 +51,13 @@ stdenv.mkDerivation rec {
libpulseaudio
openal
udev
] ++ lib.optionals stdenv.isDarwin [
]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
Carbon
Cocoa
OpenAL
OpenGL
];
]);
patches = [
# Includes cmath header
@ -151,6 +149,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
}
# TODO: select between Qt, GTK2 and GTK3

View file

@ -33938,9 +33938,7 @@ with pkgs;
python = python3;
};
higan = callPackage ../misc/emulators/higan {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL;
};
higan = callPackage ../misc/emulators/higan { };
bsnes-hd = callPackage ../misc/emulators/bsnes-hd {
inherit (gnome2) gtksourceview;