mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 09:23:01 +00:00
Merge pull request #207999 from trofi/gtk2-without-xlibsWrapper
gtk2: drop unused xlibsWrapper import
This commit is contained in:
commit
3c9246399d
@ -1,5 +1,5 @@
|
|||||||
{ config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
|
{ config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
|
||||||
, gdk-pixbuf, xlibsWrapper, gobject-introspection
|
, gdk-pixbuf, gobject-introspection
|
||||||
, xineramaSupport ? stdenv.isLinux
|
, xineramaSupport ? stdenv.isLinux
|
||||||
, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups
|
, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups
|
||||||
, gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
|
, gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
|
||||||
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||||||
++ optionals (stdenv.isLinux || stdenv.isDarwin) [
|
++ optionals (stdenv.isLinux || stdenv.isDarwin) [
|
||||||
libXrandr libXrender libXcomposite libXi libXcursor
|
libXrandr libXrender libXcomposite libXi libXcursor
|
||||||
]
|
]
|
||||||
++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ]
|
++ optionals stdenv.isDarwin [ libXdamage ]
|
||||||
++ optional xineramaSupport libXinerama
|
++ optional xineramaSupport libXinerama
|
||||||
++ optionals cupsSupport [ cups ]
|
++ optionals cupsSupport [ cups ]
|
||||||
++ optionals stdenv.isDarwin [ AppKit Cocoa ];
|
++ optionals stdenv.isDarwin [ AppKit Cocoa ];
|
||||||
|
Loading…
Reference in New Issue
Block a user