diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:13:22 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 12:08:24 +0200 |
commit | 21e3ff658ac2d7b7986169f31550aa5f65bb7635 (patch) | |
tree | a23f824d60d9aad34473c8828278c0fdba2dc188 /pkgs/development/libraries/gtk+/2.x.nix | |
parent | 47ad941fbfe752f679d6bc577d2408f79aee7054 (diff) |
x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs before this set of refactoring. But that config wasn't even used by default.
Diffstat (limited to 'pkgs/development/libraries/gtk+/2.x.nix')
-rw-r--r-- | pkgs/development/libraries/gtk+/2.x.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index fec9d16cf959a..01f7b6e1065df 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs -, gdk_pixbuf, libintlOrEmpty, x11 +, gdk_pixbuf, libintlOrEmpty, xlibsWrapper , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ++ optionals (stdenv.isLinux || stdenv.isDarwin) [ libXrandr libXrender libXcomposite libXi libXcursor ] - ++ optionals stdenv.isDarwin [ x11 libXdamage ] + ++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ] ++ libintlOrEmpty ++ optional xineramaSupport libXinerama ++ optionals cupsSupport [ cups ]; |