about summary refs log tree commit diff
path: root/pkgs/development/libraries/qt-5/modules
diff options
context:
space:
mode:
authorvolth <volth@webmaster.ms>2018-03-13 10:16:03 +0000
committerzimbatm <zimbatm@zimbatm.com>2018-03-13 10:16:03 +0000
commit7ec04712423d47148f98fe3c935c60d181af99c4 (patch)
treea15663ddc34ee04316c32f3cf59b2fca8d9cd6b6 /pkgs/development/libraries/qt-5/modules
parentebb562d29a6b397d1fb30d094cefe2030559711c (diff)
downloadnixlib-7ec04712423d47148f98fe3c935c60d181af99c4.tar
nixlib-7ec04712423d47148f98fe3c935c60d181af99c4.tar.gz
nixlib-7ec04712423d47148f98fe3c935c60d181af99c4.tar.bz2
nixlib-7ec04712423d47148f98fe3c935c60d181af99c4.tar.lz
nixlib-7ec04712423d47148f98fe3c935c60d181af99c4.tar.xz
nixlib-7ec04712423d47148f98fe3c935c60d181af99c4.tar.zst
nixlib-7ec04712423d47148f98fe3c935c60d181af99c4.zip
treewide: s/xlibs/xorg/g (#36889)
Diffstat (limited to 'pkgs/development/libraries/qt-5/modules')
-rw-r--r--pkgs/development/libraries/qt-5/modules/qtbase.nix2
-rw-r--r--pkgs/development/libraries/qt-5/modules/qtwebengine.nix6
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index c6473ff188a7..8887e05704d2 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -10,7 +10,7 @@
   dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite,
   libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff,
   libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev,
-  xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xlibs,
+  xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xorg,
   zlib,
 
   # optional dependencies
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 4be72b087842..df9995bc3b9f 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -3,7 +3,7 @@
 
 , bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which
 
-, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst
+, xorg, libXcursor, libXScrnSaver, libXrandr, libXtst
 , fontconfig, freetype, harfbuzz, icu, dbus
 , zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus
 , jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent
@@ -103,8 +103,8 @@ qtModule {
     pciutils
 
     # X11 libs
-    xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst
-    xlibs.libXcomposite
+    xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst
+    xorg.libXcomposite
   ];
 
   dontUseNinjaBuild = true;