public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40904 from matthewbauer/freeciv-on-darwin

Browse Source 
Freeciv: enable on darwin
This commit is contained in:
Matthew Justin Bauer 2018-05-22 22:37:11 -05:00 committed by GitHub
commit 75ae4c5a19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/gtk+/2.x.nix
View File

@ -4,6 +4,7 @@
, cupsSupport ? true, cups ? null , cupsSupport ? true, cups ? null
, gdktarget ? "x11" , gdktarget ? "x11"
, AppKit, Cocoa , AppKit, Cocoa
, fetchpatch
}: }:
assert xineramaSupport -> xorg.libXinerama != null; assert xineramaSupport -> xorg.libXinerama != null;
@ -28,7 +29,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ setupHook perl pkgconfig gettext gobjectIntrospection ]; 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; propagatedBuildInputs = with xorg;
[ glib cairo pango gdk_pixbuf atk ] [ glib cairo pango gdk_pixbuf atk ]

6
pkgs/games/freeciv/default.nix
View File

@ -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 , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth
, gtkClient ? false, gtk2 , gtkClient ? false, gtk2
, server ? true, readline , server ? true, readline
@ -22,7 +22,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ]; 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 sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ]
++ optionals gtkClient [ gtk2 ] ++ optionals gtkClient [ gtk2 ]
++ optional server readline ++ optional server readline
@ -50,6 +50,6 @@ stdenv.mkDerivation {
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ pierron ]; maintainers = with maintainers; [ pierron ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }