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

gtk2: fix compilation on darwin

Browse Source 
* add libintlOrEmpty to build inputs
* allow cups to be disabled by setting config.gtk2.cups to false
This commit is contained in:
Jason "Don" O'Conal 2013-06-13 18:10:53 +10:00
parent 930b88c2a9
commit dc0c630e54
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/gtk+/2.24.x.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs
, gdk_pixbuf, xz
, gdk_pixbuf, xz, libintlOrEmpty
, xineramaSupport ? true
, cupsSupport ? true, cups ? null
}:
@ -17,12 +17,14 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
nativeBuildInputs = [ perl pkgconfig ];
propagatedBuildInputs =
[ xlibs.xlibs glib atk pango gdk_pixbuf cairo
xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
]
xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi ]
++ libintlOrEmpty
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ];

4
pkgs/top-level/all-packages.nix
View File

@ -4089,7 +4089,9 @@ let
gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.26.x.nix { };
gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { };
gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix {
cupsSupport = config.gtk2.cups or true;
};
gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { });
gtk = pkgs.gtk2;