diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-06-19 08:59:30 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-06-19 09:00:06 +0200 |
| commit | 4255b343e8ca737f148e0b9b42460b190ee1bbee (patch) | |
| tree | 843ba78c188818ec5e09ba49c88445c49244c1b7 /pkgs/development/libraries/gtk+ | |
| parent | 6b4eaf71fe7b668abef6132a58e4700c29246a1a (diff) | |
| download | nixlib-4255b343e8ca737f148e0b9b42460b190ee1bbee.tar nixlib-4255b343e8ca737f148e0b9b42460b190ee1bbee.tar.gz nixlib-4255b343e8ca737f148e0b9b42460b190ee1bbee.tar.bz2 nixlib-4255b343e8ca737f148e0b9b42460b190ee1bbee.tar.lz nixlib-4255b343e8ca737f148e0b9b42460b190ee1bbee.tar.xz nixlib-4255b343e8ca737f148e0b9b42460b190ee1bbee.tar.zst nixlib-4255b343e8ca737f148e0b9b42460b190ee1bbee.zip | |
pango, gtk3: non-Linux attempts to fix
Diffstat (limited to 'pkgs/development/libraries/gtk+')
| -rw-r--r-- | pkgs/development/libraries/gtk+/3.x.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 8abc602c0a1f..f89b521758ca 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext -, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs +, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs, x11 , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null }: @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig gettext ]; - propagatedBuildInputs = with xlibs; [ - expat glib cairo pango gdk_pixbuf atk at_spi2_atk - libXrandr libXrender libXcomposite libXi libXcursor - ] ++ stdenv.lib.optional xineramaSupport libXinerama + propagatedBuildInputs = with xlibs; with stdenv.lib; + [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ] + ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor ] + ++ optional stdenv.isDarwin x11 + ++ stdenv.lib.optional xineramaSupport libXinerama ++ stdenv.lib.optionals cupsSupport [ cups ]; postInstall = "rm -rf $out/share/gtk-doc"; |