From 88c9f8b574ead01e32c5ee5228679723343cd52c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 15 Sep 2015 11:26:18 +0200 Subject: [PATCH] xlibs: replace occurrences by xorg This seems to have been confusing people, using both xlibs and xorg, etc. - Avoided renaming local (and different) xlibs binding in gcc*. - Fixed cases where both xorg and xlibs were used. Hopefully everything still works as before. --- doc/functions.xml | 2 +- .../services/x11/display-managers/gdm.nix | 2 +- .../services/x11/display-managers/kdm.nix | 2 +- pkgs/applications/audio/audacious/default.nix | 4 +- pkgs/applications/audio/bristol/default.nix | 6 +-- pkgs/applications/audio/distrho/default.nix | 6 +-- pkgs/applications/audio/eq10q/default.nix | 4 +- pkgs/applications/audio/jaaa/default.nix | 2 +- pkgs/applications/audio/rkrlv2/default.nix | 4 +- pkgs/applications/audio/spotify/default.nix | 22 ++++----- pkgs/applications/audio/tetraproc/default.nix | 4 +- pkgs/applications/editors/atom/default.nix | 8 ++-- .../editors/lighttable/default.nix | 6 +-- pkgs/applications/editors/sublime/default.nix | 4 +- .../applications/editors/sublime3/default.nix | 4 +- pkgs/applications/graphics/gimp/2.8.nix | 6 +-- pkgs/applications/inferno/default.nix | 4 +- pkgs/applications/kde-apps-15.04/default.nix | 10 ++-- pkgs/applications/misc/evilvte/default.nix | 6 +-- pkgs/applications/misc/finalterm/default.nix | 4 +- pkgs/applications/misc/keepassx/2.0.nix | 4 +- pkgs/applications/misc/xcruiser/default.nix | 4 +- .../networking/browsers/firefox/default.nix | 12 ++--- .../instant-messengers/hipchat/default.nix | 26 +++++----- .../instant-messengers/teamspeak/client.nix | 4 +- .../instant-messengers/viber/default.nix | 10 ++-- .../mailreaders/thunderbird/default.nix | 12 ++--- pkgs/applications/office/mendeley/default.nix | 4 +- pkgs/applications/office/zotero/default.nix | 2 +- .../science/math/mathematica/9.nix | 4 +- .../science/math/mathematica/default.nix | 4 +- .../science/misc/openmodelica/default.nix | 4 +- .../git-and-tools/default.nix | 4 +- pkgs/applications/video/tvtime/default.nix | 6 +-- pkgs/applications/video/vlc/default.nix | 4 +- pkgs/applications/video/xine-ui/default.nix | 6 +-- .../virtualization/xen/generic.nix | 4 +- .../window-managers/awesome/default.nix | 20 ++++---- .../window-managers/qtile/default.nix | 8 ++-- pkgs/data/documentation/zeal/default.nix | 4 +- pkgs/desktops/e19/efl.nix | 16 +++---- pkgs/desktops/e19/enlightenment.nix | 6 +-- pkgs/desktops/enlightenment/default.nix | 4 +- .../gnome-2/platform/gtkglext/default.nix | 4 +- .../gnome-2/platform/libgnomeui/default.nix | 4 +- pkgs/desktops/plasma-5.3/default.nix | 20 ++++---- .../compilers/cudatoolkit/generic.nix | 4 +- .../compilers/oraclejdk/jdk-linux-base.nix | 8 ++-- .../compilers/oraclejdk/jdk6-linux.nix | 8 ++-- pkgs/development/haskell-modules/default.nix | 2 +- .../haskell-modules/hackage-packages.nix | 48 +++++++++---------- pkgs/development/interpreters/erlang/R15.nix | 6 +-- pkgs/development/interpreters/erlang/R16.nix | 6 +-- pkgs/development/interpreters/erlang/R17.nix | 6 +-- pkgs/development/interpreters/erlang/R18.nix | 6 +-- .../development/interpreters/self/default.nix | 4 +- .../interpreters/xulrunner/default.nix | 12 ++--- .../libraries/at-spi2-atk/default.nix | 4 +- .../libraries/directfb/default.nix | 4 +- pkgs/development/libraries/frame/default.nix | 4 +- pkgs/development/libraries/geis/default.nix | 4 +- pkgs/development/libraries/grail/default.nix | 4 +- .../legacy/gst-plugins-base/default.nix | 4 +- pkgs/development/libraries/gtk+/2.x.nix | 6 +-- pkgs/development/libraries/gtk+/3.x.nix | 6 +-- pkgs/development/libraries/jasper/default.nix | 2 +- .../libraries/kde-frameworks-5.10/default.nix | 6 +-- .../libraries/kde-frameworks-5.12/default.nix | 6 +-- .../libraries/libclxclient/default.nix | 6 +-- pkgs/development/libraries/libcm/default.nix | 6 +-- .../libraries/qt-5/5.3/default.nix | 4 +- .../development/libraries/qt-5/5.4/qtbase.nix | 4 +- pkgs/development/libraries/wtk/default.nix | 4 +- .../libraries/xcb-util-cursor/HEAD.nix | 8 ++-- pkgs/development/pharo/vm/default.nix | 4 +- pkgs/development/r-modules/default.nix | 6 +-- pkgs/development/tools/electron/default.nix | 8 ++-- pkgs/development/tools/node-webkit/nw11.nix | 10 ++-- pkgs/development/tools/node-webkit/nw12.nix | 10 ++-- pkgs/development/tools/node-webkit/nw9.nix | 10 ++-- .../tools/selenium/server/default.nix | 4 +- pkgs/development/tools/thrust/default.nix | 8 ++-- pkgs/games/adom/default.nix | 4 +- pkgs/games/megaglest/default.nix | 4 +- pkgs/games/planetaryannihilation/default.nix | 8 ++-- pkgs/games/sdlmame/default.nix | 4 +- pkgs/games/snake4/default.nix | 4 +- pkgs/games/spring/default.nix | 4 +- pkgs/games/steam/chrootenv.nix | 36 +++++++------- pkgs/games/ue4demos/default.nix | 4 +- pkgs/games/ut2004demo/default.nix | 4 +- pkgs/games/zoom/default.nix | 2 +- pkgs/misc/emulators/wine/base.nix | 2 +- .../screensavers/electricsheep/default.nix | 4 +- pkgs/misc/themes/qtcurve/default.nix | 4 +- .../os-specific/linux/ati-drivers/default.nix | 6 +-- pkgs/os-specific/linux/nvidia-x11/beta.nix | 8 ++-- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++-- .../linux/nvidia-x11/legacy173.nix | 6 +-- .../linux/nvidia-x11/legacy304.nix | 6 +-- .../linux/nvidia-x11/legacy340.nix | 8 ++-- .../linux/opengl/xorg-sys/default.nix | 4 +- pkgs/servers/pulseaudio/default.nix | 4 +- pkgs/tools/X11/vdpauinfo/default.nix | 2 +- pkgs/tools/X11/xbrightness/default.nix | 16 +++---- pkgs/tools/X11/xrestop/default.nix | 4 +- pkgs/tools/graphics/glmark2/default.nix | 4 +- pkgs/tools/graphics/graphviz/2.32.nix | 6 +-- pkgs/tools/graphics/graphviz/default.nix | 10 ++-- pkgs/tools/inputmethods/touchegg/default.nix | 4 +- pkgs/tools/misc/antimicro/default.nix | 4 +- pkgs/tools/misc/ocz-ssd-guru/default.nix | 12 ++--- pkgs/tools/misc/pipelight/default.nix | 4 +- pkgs/tools/security/tor/torbrowser.nix | 6 +-- pkgs/top-level/all-packages.nix | 16 +++---- pkgs/top-level/perl-packages.nix | 14 +++--- pkgs/top-level/python-packages.nix | 14 +++--- 117 files changed, 406 insertions(+), 406 deletions(-) diff --git a/doc/functions.xml b/doc/functions.xml index 3e4ac3f3c6b1..7fd30cabf16b 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -248,7 +248,7 @@ c = lib.makeOverridable f { a = 1; b = 2; } targetPkgs = pkgs: (with pkgs; [ udev alsaLib - ]) ++ (with pkgs.xlibs; + ]) ++ (with pkgs.xorg; [ libX11 libXcursor libXrandr diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 887b6f88a741..c9a563768323 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -106,7 +106,7 @@ in systemd.services.display-manager.wants = [ "systemd-machined.service" ]; systemd.services.display-manager.after = [ "systemd-machined.service" ]; - systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xlibs.xhost pkgs.dbus_tools ]; + systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xorg.xhost pkgs.dbus_tools ]; services.dbus.packages = [ gdm ]; diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix index d0b69c5452c2..558f5e8cfc7e 100644 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ b/nixos/modules/services/x11/display-managers/kdm.nix @@ -19,7 +19,7 @@ let ''} [X-*-Core] - Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb + Xrdb=${pkgs.xorg.xrdb}/bin/xrdb SessionsDirs=${dmcfg.session.desktops} Session=${dmcfg.session.script} FailsafeClient=${pkgs.xterm}/bin/xterm diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 3ab113c92e89..9476fbaf3359 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs -, gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg +, gettext, dbus_glib, libxml2, libmad, xorg, alsaLib, libogg , libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper , mpg123, neon, faad2 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib - libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio + libmad xorg.libXcomposite libogg libvorbis flac alsaLib libcdio libcddb ffmpeg makeWrapper mpg123 neon faad2 ]; diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index db1f7895f4b9..e19acab36b5a 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xlibs }: +{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }: stdenv.mkDerivation rec { name = "bristol-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib libjack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext - xlibs.xproto + alsaLib libjack2 pkgconfig libpulseaudio xorg.libX11 xorg.libXext + xorg.xproto ]; preInstall = '' diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index a590716537bc..72893dfb19a1 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2 -, libxslt, lv2, pkgconfig, premake3, xlibs, ladspa-sdk }: +, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }: stdenv.mkDerivation rec { name = "distrho-ports-git-2015-07-18"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3 - xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext - xlibs.libXinerama xlibs.libXrender ladspa-sdk + xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext + xorg.libXinerama xorg.libXrender ladspa-sdk ]; buildPhase = '' diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 61c979534229..5d5b70a58985 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xlibs }: +{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xorg }: stdenv.mkDerivation rec { name = "eq10q-2-${version}"; version = "beta7.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi"; }; - buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence ]; + buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; installFlags = '' DESTDIR=$(out) diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index 0427283d54df..b0fbced22113 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xlibs, zita-alsa-pcmi }: +{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xorg, zita-alsa-pcmi }: stdenv.mkDerivation rec { name = "jaaa-${version}"; diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 9c41c88b0123..084d187c347c 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgs, fetchFromGitHub, -automake, pkgconfig, lv2, fftw, cmake, xlibs, libjack2, libsamplerate, libsndfile +automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8"; }; - buildInputs = with xlibs; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; + buildInputs = with xorg; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; meta = { description = "Rakarrak effects ported to LV2"; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 005b3e1b60d3..2868d7609738 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype +{ fetchurl, stdenv, dpkg, xorg, qt4, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf , libgcrypt, chromium, udev, fontconfig , dbus, expat }: @@ -28,16 +28,16 @@ let qt4 stdenv.cc.cc udev - xlibs.libX11 - xlibs.libXcomposite - xlibs.libXdamage - xlibs.libXext - xlibs.libXfixes - xlibs.libXi - xlibs.libXrandr - xlibs.libXrender - xlibs.libXrender - xlibs.libXScrnSaver + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXrender + xorg.libXScrnSaver ]; in diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index a107dd9794b1..d450cce7b86f 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper , expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient -, libsndfile, libxcb, xlibs +, libsndfile, libxcb, xorg }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat libjack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype - libxcb xlibs.libX11 xlibs.libXau xlibs.libXdmcp xlibs.libXft xlibs.libXrender + libxcb xorg.libX11 xorg.libXau xorg.libXdmcp xorg.libXft xorg.libXrender ]; makeFlags = [ diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 4de862b0254b..9bcad5b7649d 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, systemd +, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd }: let @@ -9,9 +9,9 @@ let paths = [ stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss - xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst - xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr - xlibs.libXcursor libcap systemd + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr + xorg.libXcursor libcap systemd ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 6db7130896f5..6dbeff55063c 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xlibs, udev +, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, udev }: let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf - xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst - xlibs.libXcomposite xlibs.libXi xlibs.libXfixes + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes ]; in assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix index ffa1c4eed34b..c7b0f9864c9a 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv, glib, xlibs, cairo, gtk}: +{ fetchurl, stdenv, glib, xorg, cairo, gtk}: let - libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo]; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo]; in assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 1764c85ca7dd..b26d27a8bc51 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -1,10 +1,10 @@ -{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango, makeWrapper, openssl, bzip2 }: +{ fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2 }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let build = "3083"; - libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango]; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango]; in let # package with just the binaries sublime = stdenv.mkDerivation { diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 83f409457fbb..7c394ae11c6f 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper -, python, pygtk, libart_lgpl, libexif, gettext, xlibs, wrapPython }: +, python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }: stdenv.mkDerivation rec { name = "gimp-2.8.14"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo freetype fontconfig lcms libpng libjpeg poppler libtiff webkit libmng librsvg libwmf zlib libzip ghostscript aalib jasper - python pygtk libart_lgpl libexif gettext xlibs.libXpm + python pygtk libart_lgpl libexif gettext xorg.libXpm wrapPython ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { #configureFlags = [ "--disable-print" ]; # "screenshot" needs this. - NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib" + NIX_LDFLAGS = "-rpath ${xorg.libX11}/lib" + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; meta = { diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix index 0d61d5635a51..a0e2796a3025 100644 --- a/pkgs/applications/inferno/default.nix +++ b/pkgs/applications/inferno/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchhg, stdenv, xlibs, gcc46, makeWrapper }: +{ fetchurl, fetchhg, stdenv, xorg, gcc46, makeWrapper }: stdenv.mkDerivation rec { # Inferno is a rolling release from a mercurial repository. For the verison number @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; # Fails with gcc48 due to inferno triggering an optimisation issue with floating point. - buildInputs = [ gcc46 xlibs.libX11 xlibs.libXpm xlibs.libXext xlibs.xextproto makeWrapper ]; + buildInputs = [ gcc46 xorg.libX11 xorg.libXpm xorg.libXext xorg.xextproto makeWrapper ]; infernoWrapper = ./inferno; diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 83aca36bc003..d1f909edf09e 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -174,7 +174,7 @@ let libvncserver libical networkmanager openal opencv openexr perl phonon pkgconfig polkit_qt4 prison python qca2 qimageblitz qjson qt4 samba saneBackends soprano speechd - strigi taglib udev xlibs xplanet xscreensaver xz; + strigi taglib udev xorg xplanet xscreensaver xz; alsa = alsaLib; assuan = libassuan; boost = boost156; @@ -289,7 +289,7 @@ let kde-wallpapers = kde4Package super.kde-wallpapers; kde-workspace = extendDerivation (kde4Package super.kde-workspace) { - buildInputs = with scope.xlibs; [ + buildInputs = with scope.xorg; [ libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil ]; nativeBuildInputs = [ scope.pkgconfig ]; @@ -385,7 +385,7 @@ let }; kmousetool = extendDerivation (kde4Package super.kmousetool) { - buildInputs = with scope.xlibs; [ libXtst libXt ]; + buildInputs = with scope.xorg; [ libXtst libXt ]; }; kmouth = kde4Package super.kmouth; @@ -407,13 +407,13 @@ let krdc = kde4Package super.krdc; kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) { - buildInputs = [ scope.xlibs.libXtst ]; + buildInputs = [ scope.xorg.libXtst ]; }; kreversi = kde4Package super.kreversi; krfb = extendDerivation (kde4Package super.krfb) { - buildInputs = with scope; [ xlibs.libXtst ktp-common-internals ]; + buildInputs = with scope; [ xorg.libXtst ktp-common-internals ]; }; ksaneplugin = kde4Package super.ksaneplugin; diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix index 5921cc308b5b..f7a8fe4eafc2 100644 --- a/pkgs/applications/misc/evilvte/default.nix +++ b/pkgs/applications/misc/evilvte/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, makeWrapper, pkgconfig, - gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xlibs, + gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg, configH }: @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xlibs.libX11 - xlibs.xproto xlibs.kbproto xlibs.libXext xlibs.xextproto makeWrapper pkgconfig + gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xorg.libX11 + xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig ]; buildPhase = '' diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index bdd1a9e8e28e..c8e8bb01e5d6 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchgit, makeWrapper , pkgconfig, cmake, libxml2, vala, intltool, libmx, gnome3, gtk3, gtk_doc , keybinder3, clutter_gtk, libnotify -, libxkbcommon, xlibs, udev +, libxkbcommon, xorg, udev , bashInteractive }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig cmake vala intltool gtk3 gnome3.gnome_common gnome3.libgee gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper - xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence + xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence libxkbcommon ] ++ lib.optionals stdenv.isLinux [ udev diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix index 6a5ce9fd6043..acdd91aaf68a 100644 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libgcrypt, qt4, xlibs, ... }: +{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }: stdenv.mkDerivation { name = "keepassx2-2.0beta2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q"; }; - buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ]; + buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ]; meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index 15202a1e90c6..f580c41c0a4d 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gccmakedep, xlibs }: +{ stdenv, fetchurl, gccmakedep, xorg }: stdenv.mkDerivation { name = "xcruiser-0.30"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi"; }; - buildInputs = with xlibs; [ gccmakedep imake libXt libXaw libXpm libXext ]; + buildInputs = with xorg; [ gccmakedep imake libXt libXaw libXpm libXext ]; configurePhase = "xmkmf -a"; diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 12d581b15666..6ca36f504d36 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs +, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx @@ -39,11 +39,11 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + python dbus dbus_glib pango freetype fontconfig xorg.libXi + xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file + alsaLib nspr nss libnotify xorg.pixman yasm mesa + xorg.libXScrnSaver xorg.scrnsaverproto pysqlite + xorg.libXext xorg.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx /* cairo */ gstreamer gst_plugins_base icu libpng jemalloc libpulseaudio # only headers are needed diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index f82ffa5ecd38..2462664b0c46 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, xlibs, freetype, fontconfig, openssl, glib +{ stdenv, fetchurl, libtool, xorg, freetype, fontconfig, openssl, glib , mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid , libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra , makeWrapper, libredirect, xkeyboard_config, xcbutilkeysyms }: @@ -10,18 +10,18 @@ let rpath = stdenv.lib.makeSearchPath "lib" [ stdenv.glibc libtool - xlibs.libXext - xlibs.libSM - xlibs.libICE - xlibs.libX11 - xlibs.libXft - xlibs.libXau - xlibs.libXdmcp - xlibs.libXrender - xlibs.libXfixes - xlibs.libXcomposite - xlibs.libxcb - xlibs.libXi + xorg.libXext + xorg.libSM + xorg.libICE + xorg.libX11 + xorg.libXft + xorg.libXau + xorg.libXdmcp + xorg.libXrender + xorg.libXfixes + xorg.libXcomposite + xorg.libxcb + xorg.libXi freetype fontconfig openssl diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 13798061b71b..ece4b9f0e013 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype -, xorg, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null +, xorg, fontconfig, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null , libredirect, quazip, less, which, unzip }: @@ -12,7 +12,7 @@ let deps = [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama - xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio + xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio ]; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 4ebfddf82e19..8e07bbf975b2 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dpkg, makeWrapper, xlibs, qt5Full, gstreamer, zlib, sqlite, libxslt }: +{ fetchurl, stdenv, dpkg, makeWrapper, xorg, qt5Full, gstreamer, zlib, sqlite, libxslt }: assert stdenv.system == "x86_64-linux"; @@ -23,15 +23,15 @@ stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath [ qt5Full - xlibs.libX11 + xorg.libX11 gstreamer zlib sqlite - xlibs.libXrender + xorg.libXrender libxslt stdenv.cc.cc - xlibs.libXScrnSaver - xlibs.libXext + xorg.libXScrnSaver + xorg.libXext ]; installPhase = '' diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 5d6e0faad4a8..96dd7bb9af04 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, which, m4, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs +, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx [ pkgconfig which libpng gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + python dbus dbus_glib pango freetype fontconfig xorg.libXi + xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file + alsaLib nspr nss libnotify xorg.pixman yasm mesa + xorg.libXScrnSaver xorg.scrnsaverproto pysqlite + xorg.libXext xorg.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification cairo icu ] ++ [ m4 ]; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index b0c3e58cfbb6..ea6d565a10ba 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, dpkg, makeWrapper, which -,gcc, xlibs, qt4, zlib +,gcc, xorg, qt4, zlib , ...}: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; @@ -24,7 +24,7 @@ let deps = [ gcc.cc qt4 - xlibs.libX11 + xorg.libX11 zlib ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 9283072c0c1b..be1729b57c91 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xlibs }: +{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }: let diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index c9357d7352f0..b24863a200fd 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -12,7 +12,7 @@ , opencv , openssl , unixODBC -, xlibs +, xorg , zlib }: @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { opencv openssl unixODBC - ] ++ (with xlibs; [ + ] ++ (with xorg; [ libX11 libXext libXtst diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 5fc704178836..331f2db34e2d 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -12,7 +12,7 @@ , opencv , openssl , unixODBC -, xlibs +, xorg , zlib , libxml2 , libuuid @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { unixODBC libxml2 libuuid - ] ++ (with xlibs; [ + ] ++ (with xorg; [ libX11 libXext libXtst diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index 3741187067dd..5357ff09b21d 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which, lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, -doxygen, boost, openscenegraph, gnome, pangox_compat, xlibs, git, bash, gtk, makeWrapper }: +doxygen, boost, openscenegraph, gnome, pangox_compat, xorg, git, bash, gtk, makeWrapper }: let @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [autoconf cmake automake libtool gfortran clang gnumake hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison - doxygen boost openscenegraph gnome.gtkglext pangox_compat xlibs.libXmu + doxygen boost openscenegraph gnome.gtkglext pangox_compat xorg.libXmu git gtk makeWrapper]; patchPhase = '' diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index adf8027bf27d..62fab543abdd 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -51,13 +51,13 @@ rec { qgit = import ./qgit { inherit fetchurl stdenv; - inherit (xlibs) libXext libX11; + inherit (xorg) libXext libX11; qt = qt4; }; qgitGit = import ./qgit/qgit-git.nix { inherit fetchurl sourceFromHead stdenv; - inherit (xlibs) libXext libX11; + inherit (xorg) libXext libX11; qt = qt4; }; diff --git a/pkgs/applications/video/tvtime/default.nix b/pkgs/applications/video/tvtime/default.nix index 2ec5e813c412..459ea533dba7 100644 --- a/pkgs/applications/video/tvtime/default.nix +++ b/pkgs/applications/video/tvtime/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibs, libX11, libXtst, libSM, libXext, libXv, libXxf86vm, libXau, +{stdenv, fetchurl, xorg, libX11, libXtst, libSM, libXext, libXv, libXxf86vm, libXau, libXdmcp, zlib, libpng, libxml2, freetype, libICE, intltool, libXinerama, gettext, pkgconfig, kernel, file, libXi}: @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { ''; configureFlags = '' - --x-includes=${xlibs.libX11}/include - --x-libraries=${xlibs.libX11}/lib + --x-includes=${xorg.libX11}/include + --x-libraries=${xorg.libX11}/lib ''; buildInputs = [ libX11 libXtst libSM libXext libXv libXxf86vm libXau libXdmcp zlib libpng libxml2 freetype libICE intltool libXinerama gettext pkgconfig file libXi ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 5fcdf3a45814..69a3f4183287 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray +{ stdenv, fetchurl, xz, bzip2, perl, xorg, libdvdnav, libbluray , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva - xlibs.xlibsWrapper xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms + xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau ] ++ (if withQt5 then with qt5; [ base ] else [qt4]) diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 1f3c43b8dc78..fd7b31de16ed 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xlibs, libpng, xineLib, readline, ncurses, curl +{stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl , lirc, shared_mime_info, libjpeg }: stdenv.mkDerivation rec { @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ xineLib libpng readline ncurses curl lirc libjpeg - xlibs.xlibsWrapper xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto - xlibs.libXinerama xlibs.libXi xlibs.libXft + xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.inputproto + xorg.libXinerama xorg.libXi xorg.libXft ]; patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c''; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 2ff66d843cad..71c26c5f99c9 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl , libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2 , lvm2, utillinux, procps, texinfo, perl, pythonPackages -, glib, bridge-utils, xlibs, pixman, iproute, udev, bison +, glib, bridge-utils, xorg, pixman, iproute, udev, bison , flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl , checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice , spice_protocol, usbredir, alsaLib, quilt @@ -66,7 +66,7 @@ stdenv.mkDerivation { [ which zlib pkgconfig SDL openssl libuuid gettext ncurses dev86 iasl pciutils bzip2 xz texinfo perl yajl pythonPackages.python pythonPackages.wrapPython - glib bridge-utils pixman iproute udev bison xlibs.libX11 + glib bridge-utils pixman iproute udev bison xorg.libX11 flex ocaml ocamlPackages.findlib figlet libaio checkpolicy pythonPackages.markdown transfig glusterfs acl cmake spice spice_protocol usbredir diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index c57a89193b5e..9c9d3d5f4514 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf -, xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs +, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen @@ -46,15 +46,15 @@ stdenv.mkDerivation rec { pango pkgconfig xcb-util-cursor - xlibs.libXau - xlibs.libXdmcp - xlibs.libxcb - xlibs.libxshmfence - xlibs.xcbutil - xlibs.xcbutilimage - xlibs.xcbutilkeysyms - xlibs.xcbutilrenderutil - xlibs.xcbutilwm + xorg.libXau + xorg.libXdmcp + xorg.libxcb + xorg.libxshmfence + xorg.xcbutil + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm #xmlto docbook_xml_dtd_45 docbook_xsl ]; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 39d942362be1..236baa131c94 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -17,20 +17,20 @@ buildPythonPackage rec { substituteInPlace libqtile/manager.py --subst-var-by out $out ''; - buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xlibs.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ]; + buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ]; cairocffi-xcffib = python27Packages.cairocffi.override { - LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib"; + LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib"; pythonPath = [ python27Packages.xcffib ]; }; pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline ]; - LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib"; + LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib"; postInstall = '' wrapProgram $out/bin/qtile \ - --prefix LD_LIBRARY_PATH : ${pkgs.xlibs.libxcb}/lib \ + --prefix LD_LIBRARY_PATH : ${pkgs.xorg.libxcb}/lib \ --prefix LD_LIBRARY_PATH : ${pkgs.glib}/lib \ --prefix LD_LIBRARY_PATH : ${pkgs.cairo}/lib \ --prefix LD_LIBRARY_PATH : ${pkgs.pango}/lib diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index ccfb43b14d5e..a6c77deb12ea 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xlibs }: +{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xorg }: stdenv.mkDerivation rec { version = "0.1.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - xlibs.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive + xorg.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive ]; configurePhase = '' diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index 10b69647c0ee..16c934b3b3af 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: stdenv.mkDerivation rec { @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-libav libpulseaudio libsndfile xlibs.libXcursor xlibs.printproto - xlibs.libX11 udev utillinuxCurses ]; + gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto + xorg.libX11 udev utillinuxCurses ]; - propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite - xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext - bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr - xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat luajit + propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xorg.libXcomposite + xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext + bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr + xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm libinput ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "ac_ct_CXX=foo" ]; - NIX_CFLAGS_COMPILE = [ "-I${xlibs.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; + NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; patches = [ ./efl-elua.patch ]; diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix index 7a350d7396b6..e4396073c03b 100644 --- a/pkgs/desktops/e19/enlightenment.nix +++ b/pkgs/desktops/e19/enlightenment.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, e19, xlibs, libffi, pam, alsaLib, luajit, bzip2 +{ stdenv, fetchurl, pkgconfig, e19, xorg, libffi, pam, alsaLib, luajit, bzip2 , libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }: stdenv.mkDerivation rec { @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; sha256 = "1y83jnq01k9i328adgjgpfwgpvvd2a1ixpm029pjcar8p1mvgadi"; }; - buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb - xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 + buildInputs = [ pkgconfig e19.efl e19.elementary xorg.libXdmcp xorg.libxcb + xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" ]; preConfigure = '' diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index a69e13630ec6..5aa3d781e4b3 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xlibs, dbus, imlib2, freetype }: +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorg, dbus, imlib2, freetype }: let version = "0.16.8.15"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ let version = "0.16.8.15"; in }; buildInputs = [pkgconfig imlib2 freetype - xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft ]; + xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXft ]; meta = { description = "Desktop shell built on the Enlightenment Foundation Libraries"; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index b278dadfe24c..ff50bcd5e5cd 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xlibs }: +{ stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xorg }: stdenv.mkDerivation rec { name = "gtkglext-1.2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lbz96jwz57hnn52b8rfj54inwpwcc9fkdq6ya043cgnfih77g8n"; }; - buildInputs = with xlibs; + buildInputs = with xorg; [ pkgconfig glib gtk mesa pango pangox_compat libX11 libXmu ]; # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 1bf2635b9878..961fb1c0a199 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango +{ stdenv, fetchurl, pkgconfig, libxml2, xorg, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , gnome_vfs, libgnome_keyring, libglade }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = - [ xlibs.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; + [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ]; } diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix index f9026b5843a1..550491731dc8 100644 --- a/pkgs/desktops/plasma-5.3/default.nix +++ b/pkgs/desktops/plasma-5.3/default.nix @@ -128,7 +128,7 @@ let freetype glib gnugrep gnused gtk2 gtk3 libinput libssh modemmanager openconnect openexr pam pango qt4 samba socat substituteAll taglib utillinux wayland xapian - xkeyboard_config xlibs xorg; + xkeyboard_config xorg; boost = boost156; canberra = libcanberra; epub = ebook_tools; @@ -157,7 +157,7 @@ let breeze-qt4 = overrideDerivation super.breeze (drv: { name = "breeze-qt4-${version}"; - buildInputs = [ pkgs.xlibs.xproto pkgs.kde4.kdelibs pkgs.qt4 ]; + buildInputs = [ pkgs.xorg.xproto pkgs.kde4.kdelibs pkgs.qt4 ]; nativeBuildInputs = [ scope.cmake pkgs.pkgconfig ]; cmakeFlags = [ "-DUSE_KDE4=ON" @@ -194,18 +194,18 @@ let }; kwin = extendDerivation super.kwin { - buildInputs = with scope.xlibs; [ libICE libSM libXcursor ]; + buildInputs = with scope.xorg; [ libICE libSM libXcursor ]; patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ]; }; libkscreen = extendDerivation super.libkscreen { - buildInputs = [ scope.xlibs.libXrandr]; + buildInputs = [ scope.xorg.libXrandr]; }; plasma-desktop = extendDerivation super.plasma-desktop { buildInputs = with scope; [ canberra ] - ++ (with xlibs; [ libxkbfile libXcursor libXft ]); + ++ (with xorg; [ libxkbfile libXcursor libXft ]); patches = [ (scope.substituteAll { src = ./plasma-desktop/plasma-desktop-hwclock.patch; @@ -217,13 +217,13 @@ let xkb = scope.xkeyboard_config; }) ]; - NIX_CFLAGS_COMPILE = with scope.xlibs; + NIX_CFLAGS_COMPILE = with scope.xorg; lib.concatStringsSep " " [ "-I${xf86inputsynaptics}/include/xorg" "-I${xf86inputevdev}/include/xorg" "-I${xorgserver}/include/xorg" ]; - cmakeFlags = with scope.xlibs; [ + cmakeFlags = with scope.xorg; [ "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include" "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include" ]; @@ -231,7 +231,7 @@ let plasma-workspace = extendDerivation super.plasma-workspace { patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ]; - buildInputs = with scope.xlibs; [ libSM libXcursor scope.pam ]; + buildInputs = with scope.xorg; [ libSM libXcursor scope.pam ]; inherit (scope) bash coreutils gnused gnugrep socat; inherit (scope) kconfig kinit kservice qt5tools; @@ -246,11 +246,11 @@ let }; powerdevil = extendDerivation super.powerdevil { - buildInputs = [ scope.xlibs.libXrandr ]; + buildInputs = [ scope.xorg.libXrandr ]; }; sddm-kcm = extendDerivation super.sddm-kcm { - buildInputs = [ scope.xlibs.libXcursor ]; + buildInputs = [ scope.xorg.libXcursor ]; }; }; diff --git a/pkgs/development/compilers/cudatoolkit/generic.nix b/pkgs/development/compilers/cudatoolkit/generic.nix index d4970b278bbe..a02c917ab24a 100644 --- a/pkgs/development/compilers/cudatoolkit/generic.nix +++ b/pkgs/development/compilers/cudatoolkit/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib -, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc +, xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc # generic inputs , version, sha256, url ? null, ... } : @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { runtimeDependencies = [ ncurses expat python zlib glibc - xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext + xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext gtk2 glib fontconfig freetype unixODBC alsaLib ]; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 35ee1a04a268..9d1d836db830 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -13,7 +13,7 @@ , requireFile , unzip , file -, xlibs ? null +, xorg ? null , installjdk ? true , pluginSupport ? true , installjce ? false @@ -34,7 +34,7 @@ }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -assert swingSupport -> xlibs != null; +assert swingSupport -> xorg != null; let @@ -173,8 +173,8 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ - (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.cc.cc] else []); + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ + (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; diff --git a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix index 84fdf63f359a..1b33a40635a5 100644 --- a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix @@ -3,14 +3,14 @@ , requireFile , unzip , makeWrapper -, xlibs ? null +, xorg ? null , installjdk ? true , pluginSupport ? true , installjce ? false }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -assert swingSupport -> xlibs != null; +assert swingSupport -> xorg != null; let @@ -73,10 +73,10 @@ stdenv.mkDerivation { */ libraries = [stdenv.cc.libc] ++ - (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []); + (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt] else []); inherit swingSupport pluginSupport architecture jce; - inherit (xlibs) libX11; + inherit (xorg) libX11; mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 7e6f1c0552d5..81687bd56a2e 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -43,7 +43,7 @@ let overrideScope = f: callPackageWithScope (mkScope (fix (extend scope.__unfix__ f))) drv args; }; - mkScope = scope: pkgs // pkgs.xlibs // pkgs.gnome // scope; + mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome // scope; defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a0fdea2fc563..3e85e7374efe 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5309,7 +5309,7 @@ self: { description = "A Haskell binding for GLFW"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; "GLFW-OGL" = callPackage ({ mkDerivation, base, libX11, libXrandr, mtl, OGL }: @@ -5323,7 +5323,7 @@ self: { description = "A binding for GLFW (OGL)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXrandr;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;}; "GLFW-b" = callPackage ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework @@ -5388,7 +5388,7 @@ self: { description = "Open OpenGL context windows in X11 with libX11"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; "GLMatrix" = callPackage ({ mkDerivation, base, OpenGLRaw }: @@ -6903,7 +6903,7 @@ self: { license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; - inherit (pkgs.xlibs) libX11;}; + inherit (pkgs.xorg) libX11;}; "HGamer3D-SFML-Binding" = callPackage ({ mkDerivation, base, hg3dsfml050, HGamer3D-Data, sfml-audio @@ -16518,9 +16518,9 @@ self: { homepage = "https://github.com/haskell-pkg-janitors/X11"; description = "A binding to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; - inherit (pkgs.xlibs) libXinerama; inherit (pkgs.xlibs) libXrandr; - inherit (pkgs.xlibs) libXrender;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + inherit (pkgs.xorg) libXrender;}; "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: @@ -16536,7 +16536,7 @@ self: { description = "Missing bindings to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11;}; + }) {inherit (pkgs.xorg) libX11;}; "X11-rm" = callPackage ({ mkDerivation, base, X11 }: @@ -16588,7 +16588,7 @@ self: { libraryPkgconfigDepends = [ libXft ]; description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts"; license = "LGPL"; - }) {inherit (pkgs.xlibs) libXft;}; + }) {inherit (pkgs.xorg) libXft;}; "X11-xshape" = callPackage ({ mkDerivation, base, X11 }: @@ -16625,7 +16625,7 @@ self: { description = "Bindings for the DirectX XInput library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) xinput;}; + }) {inherit (pkgs.xorg) xinput;}; "XMMS" = callPackage ({ mkDerivation, base, containers, xmmsclient, xmmsclient-glib }: @@ -16693,7 +16693,7 @@ self: { libraryPkgconfigDepends = [ libXau ]; description = "A binding to the X11 authentication library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libXau;}; + }) {inherit (pkgs.xorg) libXau;}; "Xec" = callPackage ({ mkDerivation, base, binary, bytestring, cairo, containers @@ -22017,7 +22017,7 @@ self: { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; - }) {inherit (pkgs.xlibs) libXScrnSaver;}; + }) {inherit (pkgs.xorg) libXScrnSaver;}; "archive" = callPackage ({ mkDerivation, base, bytestring, debian, debian-mirror, directory @@ -26520,10 +26520,10 @@ self: { jailbreak = true; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXcursor; - inherit (pkgs.xlibs) libXext; inherit (pkgs.xlibs) libXfixes; - inherit (pkgs.xlibs) libXi; inherit (pkgs.xlibs) libXinerama; - inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; + inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; inherit (pkgs) mesa;}; "bindings-K8055" = callPackage @@ -71956,7 +71956,7 @@ self: { description = "Core library for hoodle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXi;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;}; "hoodle-extra" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base @@ -101655,7 +101655,7 @@ self: { description = "Oculus Rift ffi providing head tracking data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXinerama; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;}; "oeis" = callPackage @@ -123173,7 +123173,7 @@ self: { description = "A programming language for simple GUIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXft;}; + }) {inherit (pkgs.xorg) libXft;}; "singleton-nats" = callPackage ({ mkDerivation, base, singletons }: @@ -145274,7 +145274,7 @@ self: { description = "wxHaskell C++ wrapper"; license = "unknown"; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; "wxcore" = callPackage @@ -145435,7 +145435,7 @@ self: { description = "Haskell FFI bindings for X11 XInput library (-lXi)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXi;}; + }) {inherit (pkgs.xorg) libXi;}; "x509" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base @@ -146584,8 +146584,8 @@ self: { description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {Xrender = null; inherit (pkgs.xlibs) libXpm; - inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;}; + }) {Xrender = null; inherit (pkgs.xorg) libXpm; + inherit (pkgs.xorg) libXrandr; inherit (pkgs) wirelesstools;}; "xmonad" = callPackage ({ mkDerivation, base, containers, directory, extensible-exceptions @@ -147043,7 +147043,7 @@ self: { librarySystemDepends = [ libXtst ]; description = "Thin FFI bindings to X11 XTest library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libXtst;}; + }) {inherit (pkgs.xorg) libXtst;}; "xturtle" = callPackage ({ mkDerivation, base, convertible, Imlib, setlocale, X11, X11-xft diff --git a/pkgs/development/interpreters/erlang/R15.nix b/pkgs/development/interpreters/erlang/R15.nix index e9c8380c35ae..12f7a020032e 100644 --- a/pkgs/development/interpreters/erlang/R15.nix +++ b/pkgs/development/interpreters/erlang/R15.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , makeWrapper, gnused, gawk -, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: +, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null }: -assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; +assert wxSupport -> mesa != null && wxGTK != null && xorg != null; let version = "15B03"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ]; + ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xorg.libX11 ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index 23243803e8dc..cc15a2d21f5e 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null -, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: +, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null }: -assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; +assert wxSupport -> mesa != null && wxGTK != null && xorg != null; assert odbcSupport -> unixODBC != null; with stdenv.lib; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ] + ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] ++ optional odbcSupport [ unixODBC ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 3a3d74345155..6c24f6ecb794 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null -, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null, wxmac ? null +, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null , javacSupport ? false, openjdk ? null , enableHipe ? true }: assert wxSupport -> (if stdenv.isDarwin then wxmac != null - else mesa != null && wxGTK != null && xlibs != null); + else mesa != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk != null; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xlibs.libX11 ]) + ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) ++ optional odbcSupport [ unixODBC ] ++ optional javacSupport [ openjdk ]; diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 9bc36ee47dec..7646de28a859 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null -, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null, wxmac ? null +, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null , javacSupport ? false, openjdk ? null , enableHipe ? true }: assert wxSupport -> (if stdenv.isDarwin then wxmac != null - else mesa != null && wxGTK != null && xlibs != null); + else mesa != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk != null; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xlibs.libX11 ]) + ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) ++ optional odbcSupport [ unixODBC ] ++ optional javacSupport [ openjdk ]; diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index f53e42f0bdee..d37d60993944 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, stdenv, xlibs, gcc44, makeWrapper, ncurses, cmake }: +{ fetchurl, fetchgit, stdenv, xorg, gcc44, makeWrapper, ncurses, cmake }: stdenv.mkDerivation rec { # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; # gcc 4.6 and above causes crashes on Self startup but gcc 4.4 works. - buildInputs = [ gcc44 ncurses xlibs.libX11 xlibs.libXext makeWrapper cmake ]; + buildInputs = [ gcc44 ncurses xorg.libX11 xorg.libXext makeWrapper cmake ]; selfWrapper = ./self; diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix index 1f24b4dde548..bc943a80ac7b 100644 --- a/pkgs/development/interpreters/xulrunner/default.nix +++ b/pkgs/development/interpreters/xulrunner/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs +, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + python dbus dbus_glib pango freetype fontconfig xorg.libXi + xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file + alsaLib nspr nss libnotify xorg.pixman yasm mesa + xorg.libXScrnSaver xorg.scrnsaverproto pysqlite + xorg.libXext xorg.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx cairo gstreamer gst_plugins_base icu ]; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 940fc2bb6cc6..7e6286abcce3 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi +{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi , intltool, dbus_glib, at_spi2_core, libSM }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1y9gfz1iz3wpja7s000f0bmyyvc6im5fcdl6bxwbz0v3qdgc9vvq"; }; - buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi + buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi intltool dbus_glib at_spi2_core libSM ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 81c23f7e41ce..b4dd865dec01 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib -, enableX11 ? true, xlibs +, enableX11 ? true, xorg , enableSDL ? true, SDL }: let s = @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ] ++ stdenv.lib.optional enableSDL SDL - ++ stdenv.lib.optionals enableX11 (with xlibs; [ + ++ stdenv.lib.optionals enableX11 (with xorg; [ xproto libX11 libXext #xextproto #renderproto libXrender ]); diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index 86ebaa0d8d91..fa8e9f0ef2c9 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true -, stdenv, fetchurl, pkgconfig, xlibs, xorgserver, xinput }: +, stdenv, fetchurl, pkgconfig, xorg, xorgserver, xinput }: stdenv.mkDerivation rec { name = "frame-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv pkgconfig - ] ++ stdenv.lib.optional enableX11 [xlibs.xorgserver xlibs.libX11 xlibs.libXext xlibs.libXi]; + ] ++ stdenv.lib.optional enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi]; configureFlags = stdenv.lib.optional enableX11 "--with-x11"; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 24c24fe5f123..5ef53ec79391 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true -, stdenv, fetchurl, pkgconfig, xlibs, xorgserver, python3, dbus_libs, frame, grail }: +, stdenv, fetchurl, pkgconfig, xorg, xorgserver, python3, dbus_libs, frame, grail }: stdenv.mkDerivation rec { name = "geis-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig python3 dbus_libs frame grail ] - ++ stdenv.lib.optional enableX11 [xlibs.libX11 xlibs.libXtst xlibs.libXext xlibs.libXi xlibs.xorgserver]; + ++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.xorgserver]; configureFlags = stdenv.lib.optional enableX11"--enable-x11"; diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index 3cf946bb4ba5..a4f27824d136 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true, - stdenv, fetchurl, pkgconfig, xlibs, python3, frame }: + stdenv, fetchurl, pkgconfig, xorg, python3, frame }: stdenv.mkDerivation rec { name = "grail-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig python3 frame ] - ++ stdenv.lib.optional enableX11 [xlibs.libX11 xlibs.libXtst xlibs.libXext xlibs.libXi xlibs.libXfixes]; + ++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes]; configureFlags = stdenv.lib.optional enableX11 "--with-x11"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 510ff86d1cf6..eb55ae874e5a 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia +{ fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc , libintlOrEmpty , # Whether to build no plugins that have external dependencies @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # can't build alsaLib on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib ++ stdenv.lib.optionals (!minimalDeps) - [ xlibs.xlibsWrapper xlibs.libXv libogg libtheora libvorbis freetype pango + [ xorg.xlibsWrapper xorg.libXv libogg libtheora libvorbis freetype pango liboil ] # can't build cdparanoia on darwin ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 01f7b6e1065d..e821e693b0ce 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs +{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg , gdk_pixbuf, libintlOrEmpty, xlibsWrapper , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null }: -assert xineramaSupport -> xlibs.libXinerama != null; +assert xineramaSupport -> xorg.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig gettext ]; - propagatedBuildInputs = with xlibs; with stdenv.lib; + propagatedBuildInputs = with xorg; with stdenv.lib; [ glib cairo pango gdk_pixbuf atk ] ++ optionals (stdenv.isLinux || stdenv.isDarwin) [ libXrandr libXrender libXcomposite libXi libXcursor diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 6fd583e7fee7..1929dd01c6b8 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gettext, perl , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xlibs, xlibsWrapper, wayland, libxkbcommon, epoxy +, xorg, xlibsWrapper, wayland, libxkbcommon, epoxy , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null }: -assert xineramaSupport -> xlibs.libXinerama != null; +assert xineramaSupport -> xorg.libXinerama != null; assert cupsSupport -> cups != null; let @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; buildInputs = [ libxkbcommon epoxy ]; - propagatedBuildInputs = with xlibs; with stdenv.lib; + propagatedBuildInputs = with xorg; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] ++ optionals stdenv.isLinux [ wayland ] ++ optional xineramaSupport libXinerama diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 7b86403b0aaf..2fa9cf7dbf95 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, xlibs, libjpeg }: +{ stdenv, fetchurl, unzip, xorg, libjpeg }: stdenv.mkDerivation rec { name = "jasper-1.900.1"; diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix index d5bb3f78ce85..8196aeab6c2b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix @@ -116,7 +116,7 @@ let { inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme libgcrypt libgit2 modemmanager networkmanager perl - perlPackages qimageblitz xlibs zlib; + perlPackages qimageblitz xorg zlib; boost = boost156; gif = giflib; glib2 = glib; @@ -147,7 +147,7 @@ let }); frameworkintegration = extendDerivation super.frameworkintegration { - buildInputs = [ scope.xlibs.libXcursor ]; + buildInputs = [ scope.xorg.libXcursor ]; }; kauth = extendDerivation super.kauth { @@ -164,7 +164,7 @@ let }; kdelibs4support = extendDerivation super.kdelibs4support { - buildInputs = [ scope.networkmanager scope.xlibs.libSM ]; + buildInputs = [ scope.networkmanager scope.xorg.libSM ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXML4_DTD_VERSION=4.5" diff --git a/pkgs/development/libraries/kde-frameworks-5.12/default.nix b/pkgs/development/libraries/kde-frameworks-5.12/default.nix index d8f51fe7eb78..1b42bab42639 100644 --- a/pkgs/development/libraries/kde-frameworks-5.12/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.12/default.nix @@ -116,7 +116,7 @@ let { inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme libgcrypt libgit2 modemmanager networkmanager perl - perlPackages qimageblitz xlibs zlib; + perlPackages qimageblitz xorg zlib; boost = boost156; gif = giflib; glib2 = glib; @@ -154,7 +154,7 @@ let }); frameworkintegration = extendDerivation super.frameworkintegration { - buildInputs = [ scope.xlibs.libXcursor ]; + buildInputs = [ scope.xorg.libXcursor ]; }; kauth = extendDerivation super.kauth { @@ -171,7 +171,7 @@ let }; kdelibs4support = extendDerivation super.kdelibs4support { - buildInputs = [ scope.networkmanager scope.xlibs.libSM ]; + buildInputs = [ scope.networkmanager scope.xorg.libSM ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXML4_DTD_VERSION=4.5" diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index 4dc103515ac7..4dca6b57c75a 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libclthreads, libX11, libXft, xlibs }: +{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg }: stdenv.mkDerivation rec { name = "libclxclient-${version}"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0"; }; - buildInputs = [ libclthreads libX11 libXft xlibs.xproto ]; + buildInputs = [ libclthreads libX11 libXft xorg.xproto ]; - NIX_CFLAGS_COMPILE = "-I${xlibs.xproto}/include -I${libXft}/include"; + NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft}/include"; patchPhase = '' sed -e "s@ldconfig@@" -i Makefile diff --git a/pkgs/development/libraries/libcm/default.nix b/pkgs/development/libraries/libcm/default.nix index 2b34f282d2a1..1d4e96d55b6d 100644 --- a/pkgs/development/libraries/libcm/default.nix +++ b/pkgs/development/libraries/libcm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, xlibs, mesa}: +{stdenv, fetchurl, pkgconfig, glib, xorg, mesa}: stdenv.mkDerivation { name = "libcm-0.1.1"; @@ -7,8 +7,8 @@ stdenv.mkDerivation { sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn"; }; buildInputs = [ - pkgconfig glib xlibs.xlibsWrapper xlibs.libXdamage xlibs.libXcomposite - xlibs.libXtst xlibs.inputproto + pkgconfig glib xorg.xlibsWrapper xorg.libXdamage xorg.libXcomposite + xorg.libXtst xorg.inputproto # !!! inputproto should really be propagated by libXtst ]; propagatedBuildInputs = [mesa]; diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index d1a049d78a72..0f46fec5a9af 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -2,7 +2,7 @@ , libXfixes, freetype, fontconfig, zlib, libjpeg, libpng , mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi -, gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage +, gdk_pixbuf, python, gdb, xorg, libX11, libxcb, xcbutil, xcbutilimage , xcbutilkeysyms, xcbutilwm, udev, libxml2, libxslt, pcre, libxkbcommon , alsaLib, gstreamer, gst_plugins_base , libpulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; propagatedBuildInputs = [ - xlibs.libXcomposite libX11 libxcb libXext libXrender libXi + xorg.libXcomposite libX11 libxcb libXext libXrender libXi fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre zlib libjpeg libpng libtiff sqlite icu libwebp alsaLib gstreamer gst_plugins_base libpulseaudio diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 2e4a1c1c161a..30d53eb874be 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll , srcs, version -, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi +, xorg, libX11, libxcb, libXcursor, libXext, libXrender, libXi , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon , fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre , zlib, libjpeg, libpng, libtiff, sqlite, icu @@ -163,7 +163,7 @@ stdenv.mkDerivation { PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; propagatedBuildInputs = [ - xlibs.libXcomposite libX11 libxcb libXext libXrender libXi + xorg.libXcomposite libX11 libxcb libXext libXrender libXi fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre zlib libjpeg libpng libtiff sqlite icu xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index bde3f6e4efb9..0ed4f24ef86b 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, unzip, xlibs }: +{ stdenv, requireFile, unzip, xorg }: assert stdenv.system == "i686-linux"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; - libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.cc.cc ]; + libraries = [ xorg.libXpm xorg.libXt xorg.libX11 xorg.libICE xorg.libSM stdenv.cc.cc ]; meta = { homepage = http://java.sun.com/products/sjwtoolkit/download.html; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index e503ade3ebc4..cf14490c5147 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, bashInteractive, autoconf, automake, libtool, pkgconfig -, git, xlibs, gnum4, libxcb, gperf }: +, git, xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { name = "xcb-util-cursor-0.1.1-3-gf03cc27"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { libtool libxcb pkgconfig - xlibs.utilmacros - xlibs.xcbutilimage - xlibs.xcbutilrenderutil + xorg.utilmacros + xorg.xcbutilimage + xorg.xcbutilrenderutil ]; configurePhase = '' diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index b98d1f2385d2..a62088824ff3 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xlibs, alsaLib, cairo }: +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo }: stdenv.mkDerivation rec { @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { unzip ${sources40Zip} -d $prefix/lib/pharo-vm/ ''; - buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xlibs.libX11 xlibs.libICE xlibs.libSM alsaLib cairo ]; + buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo ]; meta = { description = "Clean and innovative Smalltalk-inspired environment"; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 2d1c1566185a..a9d81f028f4a 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -235,7 +235,7 @@ let ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ]; cit = [ pkgs.gsl ]; curl = [ pkgs.curl ]; - devEMF = [ pkgs.xlibs.libXft ]; + devEMF = [ pkgs.xorg.libXft ]; diversitree = [ pkgs.gsl pkgs.fftw ]; EMCluster = [ pkgs.liblapack ]; fftw = [ pkgs.fftw ]; @@ -340,7 +340,7 @@ let TAQMNGR = [ pkgs.zlib ]; tiff = [ pkgs.libtiff ]; TKF = [ pkgs.gsl ]; - tkrplot = [ pkgs.xlibs.libX11 ]; + tkrplot = [ pkgs.xorg.libX11 ]; topicmodels = [ pkgs.gsl ]; udunits2 = [ pkgs.udunits pkgs.expat ]; V8 = [ pkgs.v8 ]; @@ -1632,7 +1632,7 @@ let }); devEMF = old.devEMF.overrideDerivation (attrs: { - NIX_CFLAGS_LINK = "-L${pkgs.xlibs.libXft}/lib -lXft"; + NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft}/lib -lXft"; }); slfm = old.slfm.overrideDerivation (attrs: { diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index b3867be6377c..d686da98fa38 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, unzip +, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, unzip , systemd }: let @@ -9,9 +9,9 @@ let paths = [ stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss - xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst - xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr - xlibs.libXcursor libcap systemd + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr + xorg.libXcursor libcap systemd ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix index 978213f67601..ed3b99aad009 100644 --- a/pkgs/development/tools/node-webkit/nw11.nix +++ b/pkgs/development/tools/node-webkit/nw11.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap , libnotify}: let @@ -9,10 +9,10 @@ let nwEnv = buildEnv { name = "node-webkit-env"; paths = [ - xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf - freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage - xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc - xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap + xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc + xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap libnotify ]; }; diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 0ad3ece24651..7492acb13678 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap , libnotify}: let @@ -9,10 +9,10 @@ let nwEnv = buildEnv { name = "nwjs-env"; paths = [ - xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf - freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage - xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc - xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap + xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc + xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap libnotify ]; }; diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix index 97399e5268ce..213b94102b0d 100644 --- a/pkgs/development/tools/node-webkit/nw9.nix +++ b/pkgs/development/tools/node-webkit/nw9.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev}: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -8,10 +8,10 @@ let nwEnv = buildEnv { name = "node-webkit-env"; paths = [ - xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf - freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage - xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc.cc - xlibs.libXtst xlibs.libXi + xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc.cc + xorg.libXtst xorg.libXi ]; }; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 26435088aded..2efd85f84010 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xlibs +{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xorg , chromedriver, chromeSupport ? true }: with stdenv.lib; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { ${jdk}/bin/jar xf $src launchers/launcher-linux-amd64 patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xlibs.libX11}/lib" \ + --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11}/lib" \ launchers/launcher-linux-${arch} ${jdk}/bin/jar uf $src launchers/launcher-linux-${arch} ''; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index a5bfb8bfc59f..a59d656b625a 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk, atk , pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss -, xlibs, libcap, unzip +, xorg, libcap, unzip }: let @@ -8,9 +8,9 @@ let name = "env-thrust"; paths = [ stdenv.cc.cc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf - cairo cups expat alsaLib nspr gconf nss xlibs.libXrender xlibs.libX11 - xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite - xlibs.libXi xlibs.libXfixes xlibs.libXrandr xlibs.libXcursor libcap + cairo cups expat alsaLib nspr gconf nss xorg.libXrender xorg.libX11 + xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite + xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index 74fe5232fa11..07075571c7e3 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio -, xlibs }: +, xorg }: assert stdenv.system == "x86_64-linux"; let - inherit (xlibs) libXext libX11; + inherit (xorg) libXext libX11; lpath = "${stdenv.cc.cc}/lib64:" + stdenv.lib.makeSearchPath "lib" [ zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio]; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 2de42fd86eed..059fa74f8be1 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, cmake, git, curl, SDL, xercesc, openal, lua , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng -, fontconfig, freetype, xlibs, makeWrapper, bash, which, gnome3, mesa_glu +, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu , mesa_drivers }: let version = "3.9.2"; lib-env = buildEnv { name = "megaglest-lib-env"; - paths = [ SDL xlibs.libSM xlibs.libICE xlibs.libX11 xlibs.libXext + paths = [ SDL xorg.libSM xorg.libICE xorg.libX11 xorg.libXext xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype stdenv.cc.cc glew mesa_glu mesa_drivers wxGTK ]; }; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index a94f388b322c..ed682e7bed93 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, fetchurl, patchelf, makeWrapper, xlibs, gtk, glib, udev, alsaLib, atk +{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk, glib, udev, alsaLib, atk , nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }: # TODO: use dynamic attributes once Nix 1.7 is out @@ -34,12 +34,12 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xorg.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" - wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" + wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xorg.libX11 xorg.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" for f in $out/lib/*; do - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xorg.libX11 stdenv.glibc xorg.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f done ''; diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 6e063a34bc82..7cc4c2b96b1e 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xlibs }: +{ stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xorg }: assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xlibs.libX11}/lib:${xlibs.libXinerama}/lib:${stdenv.cc.cc}/lib" \ + --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xorg.libX11}/lib:${xorg.libXinerama}/lib:${stdenv.cc.cc}/lib" \ share/sdlmame/sdlmame mkdir -p "$out/bin" diff --git a/pkgs/games/snake4/default.nix b/pkgs/games/snake4/default.nix index 081604d2ce8e..2899f7120983 100644 --- a/pkgs/games/snake4/default.nix +++ b/pkgs/games/snake4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, shhmsg, shhopt, xlibs }: +{ stdenv, fetchurl, shhmsg, shhopt, xorg }: stdenv.mkDerivation rec { name = "snake4-1.0.14"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "14cng9l857np42zixp440mbc8y5675frb6lhsds53j1cws9cncw9"; }; - buildInputs = with xlibs; [ shhmsg shhopt libX11 libXt libXpm libXaw libXext]; + buildInputs = with xorg; [ shhmsg shhopt libX11 libXt libXpm libXaw libXext]; preInstall = '' substituteInPlace Makefile --replace "-o \$(OWNER) -g \$(GROUP)" "" diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index aabd3656505b..fe764c90b4b0 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip -, openal, libvorbis, glew, freetype, xlibs, SDL, mesa, binutils +, openal, libvorbis, glew, freetype, xorg, SDL, mesa, binutils , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd , withAI ? true # support for AI Interfaces and Skirmish AIs @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DPREFER_STATIC_LIBS:BOOL=OFF"]; buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL - xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper + xorg.libX11 xorg.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper docbook_xsl_ns systemd ] ++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI python; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index b9d13265ce76..ffd68562dee8 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -13,7 +13,7 @@ buildFHSUserEnv { pkgs.python pkgs.gnome2.zenity pkgs.xdg_utils - pkgs.xlibs.xrandr + pkgs.xorg.xrandr pkgs.which ] ++ lib.optional (config.steam.java or false) pkgs.jdk @@ -28,23 +28,23 @@ buildFHSUserEnv { pkgs.pango pkgs.freetype - pkgs.xlibs.libICE - pkgs.xlibs.libSM - pkgs.xlibs.libX11 - pkgs.xlibs.libXau - pkgs.xlibs.libxcb - pkgs.xlibs.libXcursor - pkgs.xlibs.libXdamage - pkgs.xlibs.libXdmcp - pkgs.xlibs.libXext - pkgs.xlibs.libXfixes - pkgs.xlibs.libXi - pkgs.xlibs.libXinerama - pkgs.xlibs.libXrandr - pkgs.xlibs.libXrender - pkgs.xlibs.libXScrnSaver - pkgs.xlibs.libXtst - pkgs.xlibs.libXxf86vm + pkgs.xorg.libICE + pkgs.xorg.libSM + pkgs.xorg.libX11 + pkgs.xorg.libXau + pkgs.xorg.libxcb + pkgs.xorg.libXcursor + pkgs.xorg.libXdamage + pkgs.xorg.libXdmcp + pkgs.xorg.libXext + pkgs.xorg.libXfixes + pkgs.xorg.libXi + pkgs.xorg.libXinerama + pkgs.xorg.libXrandr + pkgs.xorg.libXrender + pkgs.xorg.libXScrnSaver + pkgs.xorg.libXtst + pkgs.xorg.libXxf86vm pkgs.ffmpeg pkgs.libpng12 diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index a0e583e1075f..ed2ea23d4158 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, patchelf, xlibs, openal }: +{ stdenv, fetchurl, unzip, patchelf, xorg, openal }: assert stdenv.isLinux; assert stdenv.isx86_64; @@ -11,7 +11,7 @@ let buildInputs = [ unzip patchelf ]; rtdeps = stdenv.lib.makeLibraryPath - [ xlibs.libXxf86vm xlibs.libXext openal ] + [ xorg.libXxf86vm xorg.libXext openal ] + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc ]; buildCommand = diff --git a/pkgs/games/ut2004demo/default.nix b/pkgs/games/ut2004demo/default.nix index a828d22ca0b0..13f770eab2bc 100644 --- a/pkgs/games/ut2004demo/default.nix +++ b/pkgs/games/ut2004demo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibs, mesa}: +{stdenv, fetchurl, xorg, mesa}: assert stdenv.system == "i686-linux"; @@ -17,7 +17,7 @@ let { name = raw.name; builder = ./make-wrapper.sh; inherit raw mesa; - inherit (xlibs) libX11 libXext; + inherit (xorg) libX11 libXext; }; } diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index 1ce2abf79b87..200b9c24c7db 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, expat, xlibsWrapper, freetype }: -# !!! assert freetype == xlibs.freetype +# !!! assert freetype == xorg.freetype stdenv.mkDerivation { name = "zoom-1.1.5"; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index db20d0aca19d..1e2d656fb0ef 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [ freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses - ]) ++ (with pkgs.xlibs; [ + ]) ++ (with pkgs.xorg; [ xlibsWrapper libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite ])); diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index bbba28a58c27..27e26d6d5df7 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xlibs}: +{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xorg}: stdenv.mkDerivation rec { name = "electricsheep-2.6.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5"; }; - buildInputs = [pkgconfig expat zlib libpng libjpeg xlibs.xlibsWrapper xlibs.libXv]; + buildInputs = [pkgconfig expat zlib libpng libjpeg xorg.xlibsWrapper xorg.libXv]; preInstall = '' installFlags=GNOME_DATADIR=$out diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix index e63f68460022..2aa73f1e0c17 100644 --- a/pkgs/misc/themes/qtcurve/default.nix +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, gettext, pkgconfig # Build tools , gtk2, kde_workspace, kdelibs # Toolkit dependencies -, libpthreadstubs, libXdmcp, libxcb, xlibs # X11 dependencies +, libpthreadstubs, libXdmcp, libxcb, xorg # X11 dependencies }: stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { libXdmcp libxcb pkgconfig - xlibs.libxshmfence + xorg.libxshmfence ]; patches = [ diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 834e798e8d1d..bb0888855095 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, which, imake +{ stdenv, fetchurl, kernel ? null, which, imake , mesa # for fgl_glxgears , libXxf86vm, xf86vidmodeproto # for fglrx_gamma , xorg, makeWrapper, glibc, patchelf @@ -48,8 +48,8 @@ stdenv.mkDerivation { patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}"; buildInputs = - [ xlibs.libXext xlibs.libX11 xlibs.libXinerama - xlibs.libXrandr which imake makeWrapper + [ xorg.libXext xorg.libX11 xorg.libXinerama + xorg.libXrandr which imake makeWrapper patchelf unzip mesa diff --git a/pkgs/os-specific/linux/nvidia-x11/beta.nix b/pkgs/os-specific/linux/nvidia-x11/beta.nix index dc6af818837a..d3111a4f75a1 100644 --- a/pkgs/os-specific/linux/nvidia-x11/beta.nix +++ b/pkgs/os-specific/linux/nvidia-x11/beta.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl , gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -43,14 +43,14 @@ stdenv.mkDerivation { dontStrip = true; - glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc]; + allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; gtkPath = optionalString (!libsOnly) (makeLibraryPath [ gtk atk pango glib gdk_pixbuf cairo ] ); - programPath = makeLibraryPath [ xlibs.libXv ]; + programPath = makeLibraryPath [ xorg.libXv ]; buildInputs = [ perl nukeReferences ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 953c8c601253..4390d5bdf3cd 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl , gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -46,14 +46,14 @@ stdenv.mkDerivation { dontStrip = true; - glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc]; + allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; gtkPath = optionalString (!libsOnly) (makeLibraryPath [ gtk atk pango glib gdk_pixbuf cairo ] ); - programPath = makeLibraryPath [ xlibs.libXv ]; + programPath = makeLibraryPath [ xorg.libXv ]; buildInputs = [ perl nukeReferences ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 432a756b6f6b..6bde91d0ffc8 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib, gdk_pixbuf}: +{stdenv, fetchurl, kernel, xorg, zlib, gtk, atk, pango, glib, gdk_pixbuf}: let @@ -30,11 +30,11 @@ stdenv.mkDerivation { dontStrip = true; - glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc]; - programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xlibs.libXv ]; + programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xorg.libXv ]; meta = { homepage = http://www.nvidia.com/object/unix.html; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index 7f13b6795d47..42e65f927b31 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl , gtk, atk, pango, glib, gdk_pixbuf , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -36,12 +36,12 @@ stdenv.mkDerivation { dontStrip = true; - glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc]; programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath - [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); + [ gtk atk pango glib gdk_pixbuf xorg.libXv ] ); buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix index a53906ed0200..bb974410e371 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl , gtk, atk, pango, glib, gdk_pixbuf , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -46,13 +46,13 @@ stdenv.mkDerivation { dontStrip = true; - glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc]; + allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; programPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); + [ gtk atk pango glib gdk_pixbuf xorg.libXv ] ); buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix index 2cebb8d9dcc2..5bb757a73a06 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix +++ b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix @@ -6,11 +6,11 @@ # Of course, use of the driver in /usr/lib is highly impure. But it # might actually work ;-) -{stdenv, xlibs, expat, libdrm}: +{stdenv, xorg, expat, libdrm}: stdenv.mkDerivation { name = "xorg-sys-opengl-3"; builder = ./builder.sh; - neededLibs = [xlibs.libXxf86vm xlibs.libXext expat libdrm stdenv.cc.cc]; + neededLibs = [xorg.libXxf86vm xorg.libXext expat libdrm stdenv.cc.cc]; } diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 41fe345bb958..86bcb3e1cec0 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook , json_c, libsndfile, libtool -, xlibs, libcap, alsaLib, glib +, xorg, libcap, alsaLib, glib , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat , speexdsp, systemd, webrtc-audio-processing, gconf ? null @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing ] ++ lib.optional jackaudioSupport libjack2 - ++ lib.optionals x11Support [ xlibs.xlibsWrapper xlibs.libXtst xlibs.libXi ] + ++ lib.optionals x11Support [ xorg.xlibsWrapper xorg.libXtst xorg.libXi ] ++ lib.optional useSystemd systemd ++ lib.optionals stdenv.isLinux [ alsaLib udev ] ++ lib.optional airtunesSupport openssl diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 167c710dd264..7a18a6a98b60 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibs, libvdpau }: +{ stdenv, fetchurl, pkgconfig, xorg, libvdpau }: stdenv.mkDerivation rec { name = "vdpauinfo-1.0"; diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix index cb10718a11b9..e7c5c5baf458 100644 --- a/pkgs/tools/X11/xbrightness/default.nix +++ b/pkgs/tools/X11/xbrightness/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibs }: +{ stdenv, fetchurl, xorg }: stdenv.mkDerivation { @@ -9,13 +9,13 @@ stdenv.mkDerivation { }; buildInputs = [ - xlibs.imake - xlibs.libX11 - xlibs.libXaw - xlibs.libXext - xlibs.libXmu - xlibs.libXpm - xlibs.libXxf86vm + xorg.imake + xorg.libX11 + xorg.libXaw + xorg.libXext + xorg.libXmu + xorg.libXpm + xorg.libXxf86vm ]; configurePhase = "xmkmf"; diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix index 5158963258c2..2f18f678483b 100644 --- a/pkgs/tools/X11/xrestop/default.nix +++ b/pkgs/tools/X11/xrestop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibs, pkgconfig, ncurses }: +{ stdenv, fetchurl, xorg, pkgconfig, ncurses }: stdenv.mkDerivation rec { name = "xrestop-${version}"; @@ -9,5 +9,5 @@ stdenv.mkDerivation rec { sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7"; }; - buildInputs = [ pkgconfig xlibs.libX11 xlibs.libXres xlibs.libXext ncurses ]; + buildInputs = [ pkgconfig xorg.libX11 xorg.libXres xorg.libXext ncurses ]; } diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 97fcd1addd01..12ae9b6d89bd 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libjpeg, libpng12, xlibs, libX11, mesa, libdrm, python27 }: +{ stdenv, fetchurl, pkgconfig, libjpeg, libpng12, xorg, libX11, mesa, libdrm, python27 }: stdenv.mkDerivation rec { name = "glmark2-${version}"; version = "2014.03"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig libjpeg libpng12 xlibs.libxcb libX11 mesa libdrm python27 + pkgconfig libjpeg libpng12 xorg.libxcb libX11 mesa libdrm python27 ]; buildPhase = '' diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index aecc7bba501a..2743bd78aa7c 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext, cairo +, yacc, libtool, fontconfig, pango, gd, xorg, gts, gettext, cairo }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig pango gd gts - ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibsWrapper xlibs.libXrender ] + ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--with-cgraph=no" "--with-sparse=no" ] - ++ stdenv.lib.optional (xlibs == null) "--without-x"; + ++ stdenv.lib.optional (xorg == null) "--without-x"; preBuild = '' sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 9c3213c878b1..fbf1c114d0a6 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, xlibs, gts, libdevil, gettext, cairo +, yacc, libtool, fontconfig, pango, gd, xorg, gts, libdevil, gettext, cairo , flex }: @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex - ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibsWrapper xlibs.libXrender pango libXaw ] + ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender pango libXaw ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; - CPPFLAGS = stdenv.lib.optionalString (xlibs != null && stdenv.system == "x86_64-darwin") + CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo"; configureFlags = @@ -36,14 +36,14 @@ stdenv.mkDerivation rec { "--with-expatincludedir=${expat}/include" "--with-expatlibdir=${expat}/lib" ] - ++ stdenv.lib.optional (xlibs == null) "--without-x"; + ++ stdenv.lib.optional (xorg == null) "--without-x"; preBuild = '' sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile ''; # "command -v" is POSIX, "which" is not - postInstall = stdenv.lib.optionalString (xlibs != null) '' + postInstall = stdenv.lib.optionalString (xorg != null) '' sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty sed -i 's|which|command -v|' $out/bin/vimdot ''; diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 1cf3cfa00af7..4ac3c02d4103 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibs, xorgserver, qt4, mesa, geis }: +{ stdenv, fetchurl, xorg, xorgserver, qt4, mesa, geis }: stdenv.mkDerivation rec { name = "touchegg-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038"; }; - buildInputs = [ xorgserver mesa xlibs.libX11 xlibs.libXtst xlibs.libXext qt4 geis ]; + buildInputs = [ xorgserver mesa xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ]; configurePhase = '' sed -e "s@/usr/@$out/@g" -i $(find . -name touchegg.pro) diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix index 80791756e659..a2eed9139306 100644 --- a/pkgs/tools/misc/antimicro/default.nix +++ b/pkgs/tools/misc/antimicro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkgconfig, SDL2, qt5, xlibs, fetchzip }: +{ stdenv, cmake, pkgconfig, SDL2, qt5, xorg, fetchzip }: stdenv.mkDerivation rec { name = "antimicro-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake pkgconfig SDL2 qt5.base qt5.tools xlibs.libXtst + cmake pkgconfig SDL2 qt5.base qt5.tools xorg.libXtst ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index 7ee6089c2496..21786f3f15f5 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xlibs, freetype, fontconfig, mesa, glibc, makeWrapper }: +{ fetchurl, stdenv, xorg, freetype, fontconfig, mesa, glibc, makeWrapper }: let system = if stdenv.system == "x86_64-linux" then "linux64" else "linux32"; @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; libPath = stdenv.lib.makeLibraryPath [ - xlibs.libX11 - xlibs.libxcb + xorg.libX11 + xorg.libxcb freetype fontconfig - xlibs.libXext - xlibs.libXi - xlibs.libXrender + xorg.libXext + xorg.libXi + xorg.libXrender stdenv.cc.cc glibc mesa diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 89459eb281bc..40f441e065df 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xlibs +{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xorg , gnupg, gcc_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr }: @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f"; }; - buildInputs = [ wine_custom xlibs.libX11 gcc_multi mesa curl ]; + buildInputs = [ wine_custom xorg.libX11 gcc_multi mesa curl ]; propagatedbuildInputs = [ curl cabextract ]; patches = [ ./pipelight.patch ]; diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index aa85793be181..bd7531af18f7 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv -, xlibs, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib}: let bits = if stdenv.system == "x86_64-linux" then "64" @@ -10,8 +10,8 @@ let name = "tor-env"; paths = [ stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype - fontconfig gdk_pixbuf cairo xlibs.libXrender xlibs.libX11 xlibs.libXext - xlibs.libXt + fontconfig gdk_pixbuf cairo xorg.libXrender xorg.libX11 xorg.libXext + xorg.libXt ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62d90f924b2c..52697ff43e94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1655,7 +1655,7 @@ let graphviz = callPackage ../tools/graphics/graphviz { }; graphviz-nox = callPackage ../tools/graphics/graphviz { - xlibs = null; + xorg = null; libdevil = libdevil-nox; }; @@ -3869,7 +3869,7 @@ let inherit zip unzip zlib boehmgc gettext pkgconfig perl; inherit gtk; inherit (gnome) libart_lgpl; - inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender + inherit (xorg) libX11 libXt libSM libICE libXtst libXi libXrender libXrandr xproto renderproto xextproto inputproto randrproto; }); @@ -8342,9 +8342,9 @@ let # Avoid using this. It isn't really a wrapper anymore, but we keep the name. xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper { packages = [ - freetype fontconfig xlibs.xproto xlibs.libX11 xlibs.libXt - xlibs.libXft xlibs.libXext xlibs.libSM xlibs.libICE - xlibs.xextproto + freetype fontconfig xorg.xproto xorg.libX11 xorg.libXt + xorg.libXft xorg.libXext xorg.libSM xorg.libICE + xorg.xextproto ]; }; @@ -10950,7 +10950,7 @@ let emacs24 = callPackage ../applications/editors/emacs-24 { # use override to enable additional features - libXaw = xlibs.libXaw; + libXaw = xorg.libXaw; Xaw3d = null; gconf = null; alsaLib = null; @@ -13064,7 +13064,7 @@ let ++ lib.optional (cfg.enableBluejeans or false) bluejeans ); libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) - (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) + (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or false) libpulseaudio; gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ]; @@ -14848,7 +14848,7 @@ let vbam = callPackage ../misc/emulators/vbam {}; vice = callPackage ../misc/emulators/vice { - libX11 = xlibs.libX11; + libX11 = xorg.libX11; giflib = giflib_4_1; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 838e5353b2f7..a6b75136325f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4687,7 +4687,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype - pkgs.libpng pkgs.fontconfig pkgs.xlibs.libXpm GetoptLong ]; + pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm GetoptLong ]; # Patch needed to get arguments past the first GetOptions call # and to specify libfontconfig search path. @@ -4697,7 +4697,7 @@ let self = _self // overrides; _self = with self; { # tests fail doCheck = false; - makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xlibs.libXpm}"; + makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xorg.libXpm}"; }; GDSecurityImage = buildPerlPackage { @@ -8249,7 +8249,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0k2k8zg84qj1ry77i9dvmfdfpg13s6117wy5bc4nvnzv37qcvy32"; }; - buildInputs = with pkgs; [ mesa mesa_glu freeglut xlibs.libX11 xlibs.libXi xlibs.libXmu xlibs.libXext xdummy ]; + buildInputs = with pkgs; [ mesa mesa_glu freeglut xorg.libX11 xorg.libXi xorg.libXmu xorg.libXext xdummy ]; patches = [ ../development/perl-modules/perl-opengl.patch ]; @@ -11723,8 +11723,8 @@ let self = _self // overrides; _self = with self; { url = "http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/${name}.tar.gz"; sha256 = "10fsvyr56gm59chc8b70n6bvhd3lh9c05sp8m4arcahid0rpgbwa"; }; - makeMakerFlags = "X11LIB=${pkgs.xlibs.libX11}/lib"; - buildInputs = with pkgs; [ xlibs.libX11 libpng ]; + makeMakerFlags = "X11LIB=${pkgs.xorg.libX11}/lib"; + buildInputs = with pkgs; [ xorg.libX11 libpng ]; configurePhase = '' perl Makefile.PL PREFIX=$out $makeMakerFlags ''; @@ -12149,9 +12149,9 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AW/AWENDT/${name}.tar.gz"; sha256 = "0j27cb9yy9ymni8cbiyxplbg086b8lv6b330nwqyx0briq3xrzfq"; }; - buildInputs = [ pkgs.xlibs.libXext pkgs.xlibs.libXScrnSaver pkgs.xlibs.libX11 ]; + buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ]; propagatedBuildInputs = [ InlineC ]; - patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xlibs.libX11}/lib/ -L${pkgs.xlibs.libXext}/lib/ -L${pkgs.xlibs.libXScrnSaver}/lib/,' IdleTime.pm''; + patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11}/lib/ -L${pkgs.xorg.libXext}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm''; meta = { description = "Get the idle time of X11"; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 411057541df3..c8555904fbde 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10267,7 +10267,7 @@ let buildInputs = with self; [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl ] ++ optionals (isPy26 || isPy27 || isPy33 || isPyPy) [ pkgs.lcms2 ] - ++ optionals (isPyPy) [ pkgs.tk pkgs.xlibs.libX11 ]; + ++ optionals (isPyPy) [ pkgs.tk pkgs.xorg.libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. preConfigure = '' @@ -11197,7 +11197,7 @@ let }; patchPhase = let - libs = [ pkgs.mesa pkgs.xlibs.libX11 pkgs.freetype pkgs.fontconfig ]; + libs = [ pkgs.mesa pkgs.xorg.libX11 pkgs.freetype pkgs.fontconfig ]; paths = concatStringsSep "," (map (l: "\"${l}/lib\"") libs); in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py"; @@ -13218,7 +13218,7 @@ let sha256 = "0l70pqwg88imbylcd831vg8nj8ipy4zr331f6qjccss7vn56i2h5"; }; - buildInputs = with self; [pkgs.xlibs.libX11]; + buildInputs = with self; [pkgs.xorg.libX11]; # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some # absolute paths. Replaced by relative path so it is found when used in nix. @@ -13232,7 +13232,7 @@ let patchPhase = '' cp "${x_ignore_nofocus}/cpp/linux-specific/"* . - substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xlibs.libX11}/lib/libX11.so.6" + substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xorg.libX11}/lib/libX11.so.6" gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o gcc -shared \ -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \ @@ -13819,7 +13819,7 @@ let # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = with self; [ pkgs.xlibs.libX11 pkgs.pythonDBus pygobject ]; + propagatedBuildInputs = with self; [ pkgs.xorg.libX11 pkgs.pythonDBus pygobject ]; meta = { description = "High-level, platform independent Skype API wrapper for Python"; @@ -14446,7 +14446,7 @@ let # I don't know why I need to add these libraries. Shouldn't they # be part of wxPython? postInstall = '' - libspaths=${pkgs.xlibs.libSM}/lib:${pkgs.xlibs.libXScrnSaver}/lib + libspaths=${pkgs.xorg.libSM}/lib:${pkgs.xorg.libXScrnSaver}/lib wrapProgram $out/bin/taskcoach.py \ --prefix LD_LIBRARY_PATH : $libspaths ''; @@ -15587,7 +15587,7 @@ let # Tests require `pyutil' so disable them to avoid circular references. doCheck = false; - propagatedBuildInputs = with self; [ pkgs.xlibs.libX11 ]; + propagatedBuildInputs = with self; [ pkgs.xorg.libX11 ]; meta = { description = "Fully functional X client library for Python programs";