treewide: s/xlibs/xorg/g (#36889)

This commit is contained in:
volth
2018-03-13 10:16:03 +00:00
committed by zimbatm
parent ebb562d29a
commit 7ec0471242
30 changed files with 103 additions and 104 deletions
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls
, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at-spi2-core
, gtk3, wayland, libwebp, enchant, xorg, libxkbcommon, epoxy, at-spi2-core
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit
, libidn, libedit, readline, libGLU_combined, libintlOrEmpty
, enableGeoLocation ? true, geoclue2, sqlite
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core
] ++ optional enableGeoLocation geoclue2
++ optional enableGtk2Plugins gtk2
++ (with xlibs; [ libXdmcp libXt libXtst ])
++ (with xorg; [ libXdmcp libXt libXtst ])
++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ]
++ optional stdenv.isLinux wayland;