Merge pull request #154702 from AndersonTorres/new-misc
higan: mark as broken on Darwin
This commit is contained in:
commit
44f40b84aa
2 changed files with 6 additions and 9 deletions
|
@ -17,10 +17,7 @@
|
||||||
, udev
|
, udev
|
||||||
# Darwin dependencies
|
# Darwin dependencies
|
||||||
, libicns
|
, libicns
|
||||||
, Carbon
|
, darwin
|
||||||
, Cocoa
|
|
||||||
, OpenAL
|
|
||||||
, OpenGL
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -54,12 +51,13 @@ stdenv.mkDerivation rec {
|
||||||
libpulseaudio
|
libpulseaudio
|
||||||
openal
|
openal
|
||||||
udev
|
udev
|
||||||
] ++ lib.optionals stdenv.isDarwin [
|
]
|
||||||
|
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||||
Carbon
|
Carbon
|
||||||
Cocoa
|
Cocoa
|
||||||
OpenAL
|
OpenAL
|
||||||
OpenGL
|
OpenGL
|
||||||
];
|
]);
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Includes cmath header
|
# Includes cmath header
|
||||||
|
@ -151,6 +149,7 @@ stdenv.mkDerivation rec {
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ AndersonTorres ];
|
maintainers = with maintainers; [ AndersonTorres ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
|
broken = stdenv.isDarwin;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
# TODO: select between Qt, GTK2 and GTK3
|
# TODO: select between Qt, GTK2 and GTK3
|
||||||
|
|
|
@ -33938,9 +33938,7 @@ with pkgs;
|
||||||
python = python3;
|
python = python3;
|
||||||
};
|
};
|
||||||
|
|
||||||
higan = callPackage ../misc/emulators/higan {
|
higan = callPackage ../misc/emulators/higan { };
|
||||||
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL;
|
|
||||||
};
|
|
||||||
|
|
||||||
bsnes-hd = callPackage ../misc/emulators/bsnes-hd {
|
bsnes-hd = callPackage ../misc/emulators/bsnes-hd {
|
||||||
inherit (gnome2) gtksourceview;
|
inherit (gnome2) gtksourceview;
|
||||||
|
|
Loading…
Reference in a new issue