mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
Merge pull request #40904 from matthewbauer/freeciv-on-darwin
Freeciv: enable on darwin
This commit is contained in:
commit
75ae4c5a19
|
@ -4,6 +4,7 @@
|
|||
, cupsSupport ? true, cups ? null
|
||||
, gdktarget ? "x11"
|
||||
, AppKit, Cocoa
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
assert xineramaSupport -> xorg.libXinerama != null;
|
||||
|
@ -28,7 +29,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ setupHook perl pkgconfig gettext gobjectIntrospection ];
|
||||
|
||||
patches = [ ./2.0-immodules.cache.patch ./gtk2-theme-paths.patch ];
|
||||
patches = [
|
||||
./2.0-immodules.cache.patch
|
||||
./gtk2-theme-paths.patch
|
||||
] ++ optional stdenv.isDarwin (fetchpatch {
|
||||
url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776;
|
||||
sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r";
|
||||
});
|
||||
|
||||
propagatedBuildInputs = with xorg;
|
||||
[ glib cairo pango gdk_pixbuf atk ]
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext
|
||||
{ stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext, libiconv
|
||||
, sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth
|
||||
, gtkClient ? false, gtk2
|
||||
, server ? true, readline
|
||||
|
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
|||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
buildInputs = [ zlib bzip2 curl lzma gettext ]
|
||||
buildInputs = [ zlib bzip2 curl lzma gettext libiconv ]
|
||||
++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ]
|
||||
++ optionals gtkClient [ gtk2 ]
|
||||
++ optional server readline
|
||||
|
@ -50,6 +50,6 @@ stdenv.mkDerivation {
|
|||
license = licenses.gpl2;
|
||||
|
||||
maintainers = with maintainers; [ pierron ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue