diff options
| author | Song Wenwu <iyzsong@gmail.com> | 2013-04-18 10:56:10 +0800 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-18 16:14:44 +0200 |
| commit | 3b01d244c3caef6e53b4d768eac4f58423af7ee9 (patch) | |
| tree | 3dbcbe344183188d898f3ff51925064471473de3 /pkgs | |
| parent | 5fce03c561be81b64a0c55c14dce576712186602 (diff) | |
| download | nixlib-3b01d244c3caef6e53b4d768eac4f58423af7ee9.tar nixlib-3b01d244c3caef6e53b4d768eac4f58423af7ee9.tar.gz nixlib-3b01d244c3caef6e53b4d768eac4f58423af7ee9.tar.bz2 nixlib-3b01d244c3caef6e53b4d768eac4f58423af7ee9.tar.lz nixlib-3b01d244c3caef6e53b4d768eac4f58423af7ee9.tar.xz nixlib-3b01d244c3caef6e53b4d768eac4f58423af7ee9.tar.zst nixlib-3b01d244c3caef6e53b4d768eac4f58423af7ee9.zip | |
gtk+: enable xcursor support, fixes #469
@vcunat also reorganized the build input lists a bit
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gtk+/2.x.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk+/3-default.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index da64fe1fe247..c8224fa18e6d 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig ]; - propagatedBuildInputs = - [ xlibs.xlibs glib atk pango gdk_pixbuf cairo - xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi + propagatedBuildInputs = with xlibs; + [ glib cairo pango gdk_pixbuf atk + libXrandr libXrender libXcomposite libXi libXcursor ] - ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama + ++ stdenv.lib.optional xineramaSupport libXinerama ++ stdenv.lib.optionals cupsSupport [ cups ]; configureFlags = "--with-xinput=yes"; diff --git a/pkgs/development/libraries/gtk+/3-default.nix b/pkgs/development/libraries/gtk+/3-default.nix index d37a814c5497..1b296e2c3985 100644 --- a/pkgs/development/libraries/gtk+/3-default.nix +++ b/pkgs/development/libraries/gtk+/3-default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = with xlibs; [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk - libXrandr libXrender libXcomposite libXi - ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama + libXrandr libXrender libXcomposite libXi libXcursor + ] ++ stdenv.lib.optional xineramaSupport libXinerama ++ stdenv.lib.optionals cupsSupport [ cups ]; postInstall = "rm -rf $out/share/gtk-doc"; |