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
parent eaf1c07836 9b8b29f175
commit 75ae4c5a19
2 changed files with 11 additions and 4 deletions
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
, 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 ]