diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:13:22 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 12:08:24 +0200 |
commit | 21e3ff658ac2d7b7986169f31550aa5f65bb7635 (patch) | |
tree | a23f824d60d9aad34473c8828278c0fdba2dc188 /pkgs | |
parent | 47ad941fbfe752f679d6bc577d2408f79aee7054 (diff) |
x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs before this set of refactoring. But that config wasn't even used by default.
Diffstat (limited to 'pkgs')
83 files changed, 183 insertions, 187 deletions
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 1b9323c1a7bab..5bec7aa6dd049 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, x11 +{ stdenv, fetchurl, cmake, qt4, pkgconfig, xlibsWrapper # transports , curl, libmms # input plugins @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ # basic requirements - cmake qt4 pkgconfig x11 + cmake qt4 pkgconfig xlibsWrapper # transports curl libmms # input plugins diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 9433798905525..e0c5db18dbb4b 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 -, intltool, x11, libxklavier, libgcrypt +, intltool, xlibsWrapper, libxklavier, libgcrypt , qt4 ? null, qt5 ? null }: diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 6c52a8991089e..368b06b17e074 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d +{ stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , alsaLib, cairo, acl, gpm @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext ] ++ stdenv.lib.optional stdenv.isLinux dbus ++ stdenv.lib.optionals withX - [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft + [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] ++ stdenv.lib.optional (withX && withGTK2) gtk2 ++ stdenv.lib.optional (withX && withGTK3) gtk3 diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index a4dfc4719dc42..56a8ac62025fb 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, motif, libXpm }: +{ stdenv, fetchurl, xlibsWrapper, motif, libXpm }: assert stdenv.isLinux; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna"; }; - buildInputs = [ x11 motif libXpm ]; + buildInputs = [ xlibsWrapper motif libXpm ]; buildFlags = if stdenv.isLinux then "linux" else ""; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 98663a946ae5b..8d9771c913488 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl, +{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }: stdenv.mkDerivation rec { name = "qgis-2.10.1"; - buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl qwt qscintilla + buildInputs = [ gdal qt4 flex bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql ] ++ (with pythonPackages; [ numpy psycopg2 ]) ++ [ pythonPackages.qscintilla ]; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index ac0a2ec0d4c9a..266f70e3008fc 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng +{ stdenv, makeWrapper, fetchurl, xlibsWrapper, imlib2, libjpeg, libpng , libXinerama, curl, libexif }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1059mflgw8hl398lwy55fj50a98xryvdf23wkpbn4s0z9388hl46"; }; - buildInputs = [ makeWrapper x11 imlib2 libjpeg libpng libXinerama curl libexif ]; + buildInputs = [ makeWrapper xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ]; preBuild = '' makeFlags="PREFIX=$out exif=1" diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index 88183c5e5a3b3..9e53fe3efe2c6 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, imake -, x11, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}: +, xlibsWrapper, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}: let version = "3.2.5b"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { builder = ./builder.sh; - buildInputs = [x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg]; + buildInputs = [xlibsWrapper libXpm libXmu libXi libXp Xaw3d libpng libjpeg]; nativeBuildInputs = [ imake makeWrapper ]; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index c010047845fc0..ac60d9285876e 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, x11, libX11, libXi, libXtst, libXrandr +{ stdenv, fetchFromGitHub, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr , xinput, curl, openssl, unzip }: with stdenv.lib; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - cmake x11 libX11 libXi libXtst libXrandr xinput curl openssl + cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl ]; installPhase = '' diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index c70436e68f998..b244e9c1bfce9 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tcl, tk, x11, makeWrapper}: +{stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}: let version = "3.0"; in stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc"; }; - buildInputs = [tcl tk x11 makeWrapper]; + buildInputs = [tcl tk xlibsWrapper makeWrapper]; patchPhase = '' sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 5055ac50089d2..0ea1159208f42 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fox, pkgconfig, gettext, x11, gcc, intltool, file, libpng }: +{ stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }: stdenv.mkDerivation rec { name = "xfe-1.37"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd"; }; - buildInputs = [ fox pkgconfig gettext x11 gcc intltool file libpng ]; + buildInputs = [ fox pkgconfig gettext xlibsWrapper gcc intltool file libpng ]; preConfigure = '' sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 2e690dcce0909..e677164ecf484 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,9 +1,9 @@ { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false -, stdenv, fetchurl, zlib, libpng, x11 ? null, motif ? null, freetype ? null, t1lib ? null +, stdenv, fetchurl, zlib, libpng, xlibsWrapper ? null, motif ? null, freetype ? null, t1lib ? null , base14Fonts ? null }: -assert enableGUI -> x11 != null && motif != null && freetype != null; +assert enableGUI -> xlibsWrapper != null && motif != null && freetype != null; assert enablePDFtoPPM -> freetype != null; assert useT1Lib -> t1lib != null; @@ -18,7 +18,7 @@ stdenv.mkDerivation { }; buildInputs = [ zlib libpng ] ++ - stdenv.lib.optionals enableGUI [x11 motif] ++ + stdenv.lib.optionals enableGUI [xlibsWrapper motif] ++ stdenv.lib.optional useT1Lib t1lib ++ stdenv.lib.optional enablePDFtoPPM freetype; diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 0e4fd4db1ba8a..1a698b0effda9 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, ncurses, x11, bzip2, zlib, openssl +{ stdenv, fetchurl, perl, ncurses, xlibsWrapper, bzip2, zlib, openssl , spidermonkey, gpm , enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2 , enablePython ? false, python ? null @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = [ ./gc-init.patch ]; - buildInputs = [ perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ] + buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ] ++ stdenv.lib.optional enableGuile guile ++ stdenv.lib.optional enablePython python; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix index 05e3a8bf613a6..ba40925e1d1eb 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11 +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, xlibsWrapper , GConf, gnome_mplayer, mplayer, gmtk }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49"; }; - buildInputs = [ pkgconfig glib dbus dbus_glib browser x11 GConf browser gmtk ]; + buildInputs = [ pkgconfig glib dbus dbus_glib browser xlibsWrapper GConf browser gmtk ]; # !!! fix this preBuild = diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index ade28b519bc5d..d8c421af46a85 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -3,12 +3,12 @@ , graphicsSupport ? false , mouseSupport ? false , ncurses, openssl ? null, boehmgc, gettext, zlib -, imlib2 ? null, x11 ? null, fbcon ? null +, imlib2 ? null, xlibsWrapper ? null, fbcon ? null , gpm-ncurses ? null }: assert sslSupport -> openssl != null; -assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null); +assert graphicsSupport -> imlib2 != null && (xlibsWrapper != null || fbcon != null); assert mouseSupport -> gpm-ncurses != null; stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ncurses boehmgc gettext zlib] ++ stdenv.lib.optional sslSupport openssl ++ stdenv.lib.optional mouseSupport gpm-ncurses - ++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon]; + ++ stdenv.lib.optionals graphicsSupport [imlib2 xlibsWrapper fbcon]; configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}" + stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb"; diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix index 37c0b4a694dd8..770f0952e1fc3 100644 --- a/pkgs/applications/networking/instant-messengers/amsn/default.nix +++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}: +{stdenv, fetchurl, which, tcl, tk, xlibsWrapper, libpng, libjpeg, makeWrapper}: stdenv.mkDerivation { name = "amsn-0.98.9"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static"; - buildInputs = [which tcl tk x11 libpng libjpeg makeWrapper]; + buildInputs = [which tcl tk xlibsWrapper libpng libjpeg makeWrapper]; postInstall = '' wrapProgram $out/bin/amsn --prefix PATH : ${tk}/bin diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index d0cc333c71b67..f9209f28cf20a 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg -, bwidget, makeWrapper, x11 +, bwidget, makeWrapper, xlibsWrapper , withSitePlugins ? true , theme ? null }: @@ -62,7 +62,7 @@ in mkTkabber (main // { done ''; - buildInputs = [ tcl tk x11 makeWrapper ] ++ tclLibraries; + buildInputs = [ tcl tk xlibsWrapper makeWrapper ] ++ tclLibraries; meta = { homepage = "http://tkabber.jabber.ru/"; diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index bbb34e08c4687..8482bd6fe94b6 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -8,7 +8,7 @@ , ocaml, withOCaml ? false #, withJava ? false #, atlasMath, withAtlas ? false -, x11, withX ? false +, xlibsWrapper, withX ? false }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [gfortran ncurses] ++ lib.optionals withGtk [gtk] ++ lib.optionals withOCaml [ocaml] - ++ lib.optionals withX [x11] + ++ lib.optional withX xlibsWrapper ; @@ -58,11 +58,7 @@ stdenv.mkDerivation rec { # do not compile Java interface + " --without-java" # use the X Window System - + (lib.optionalString withX " - --with-x - --x-libraries=${x11}/lib - --x-includes=${x11}/include - ") + + lib.optionalString withX "--with-x" ; makeFlags = "all"; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index fc773211f69bb..c129597151f5e 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -3,7 +3,7 @@ , gst_ffmpeg, speex , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool , boost, freetype, agg, dbus, curl, pkgconfig, gettext -, glib, gtk, gtkglext, pangox_compat, x11, ming, dejagnu, python, perl +, glib, gtk, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl , freefont_ttf, haxe, swftools , lib, makeWrapper , xulrunner }: @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # XXX: KDE is supported as well so we could make it available optionally. buildInputs = [ - gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good + gettext xlibsWrapper SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg speex libtool libogg libxml2 libjpeg mesa libpng libungif boost freetype agg dbus curl pkgconfig glib gtk gtkglext pangox_compat diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index cd157a473e62e..4320022192a4e 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, qt4, x11, libpulseaudio, fftwSinglePrec +{ stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec , lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sourceRoot = "${name}/mythtv"; buildInputs = [ - freetype qt4 lame zlib x11 mesa perl alsaLib libpulseaudio fftwSinglePrec + freetype qt4 lame zlib xlibsWrapper mesa perl alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib ]; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index cfe4ad3a8e19a..e8c6b39f4933f 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper, autoconf, automake, libmspack, openssl, pam, xercesc, icu, libdnet, procps, - x11, libXinerama, libXi, libXrender, libXrandr, libXtst, + xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst, pkgconfig, glib, gtk, gtkmm }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation { buildInputs = [ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps - pkgconfig glib gtk gtkmm x11 libXinerama libXi libXrender libXrandr libXtst ]; + pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ]; patchPhase = '' sed -i s,-Werror,,g configure.ac diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 7a467b1fcdb94..f419907307748 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, lua, gettext, groff }: +{ stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }: stdenv.mkDerivation { name = "ion-3-20090110"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz; sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; }; - buildInputs = [ x11 lua gettext groff ]; + buildInputs = [ xlibsWrapper lua gettext groff ]; buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; installFlags = "PREFIX=\${out}"; } diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index cd43c06d33e27..2177d1a871f09 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -4,7 +4,7 @@ stdenv, fetchurl, lua, gettext, groff, pkgconfig, busybox, - x11, libXinerama, libXrandr, libX11 + xlibsWrapper, libXinerama, libXrandr, libX11 }: assert enableXft -> libXft != null; @@ -26,7 +26,7 @@ stdenv.mkDerivation { patches = patches ++ stdenv.lib.optional enableXft ./notion-xft_nixos.diff; postPatch = "substituteInPlace system-autodetect.mk --replace '#PRELOAD_MODULES=1' 'PRELOAD_MODULES=1'"; - buildInputs = [x11 lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft; + buildInputs = [xlibsWrapper lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft; buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; installFlags = "PREFIX=\${out}"; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index d270d3a2b1d6b..7a662aaf09e85 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb -, libXcursor, x11, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput +, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , libwebp ? null, xwayland ? null # beware of null defaults, as the parameters *are* supplied by callPackage by default @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor x11 udev libdrm + pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva libwebp ]; diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 61f58719b2726..a69e13630ec60 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, x11, xlibs, dbus, imlib2, freetype }: +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xlibs, dbus, imlib2, freetype }: let version = "0.16.8.15"; in stdenv.mkDerivation { diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix index f4640b36e67a8..a2581f29a3f76 100644 --- a/pkgs/development/compilers/ocaml/3.08.0.nix +++ b/pkgs/development/compilers/ocaml/3.08.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11 }: +{ stdenv, fetchurl, xlibsWrapper }: stdenv.mkDerivation { name = "ocaml-3.08.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; configureScript = ./configure-3.08.0; dontAddPrefix = "True"; - configureFlags = ["-no-tk" "-x11lib" x11]; + configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; buildFlags = ["world" "bootstrap" "opt"]; checkTarget = ["opt.opt"]; } diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 69a6a1f5f6763..2734bc3235d72 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, ncurses }: +{ stdenv, fetchurl, xlibsWrapper, ncurses }: stdenv.mkDerivation (rec { @@ -10,9 +10,9 @@ stdenv.mkDerivation (rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk" "-x11lib" x11]; + configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; buildFlags = "world bootstrap world.opt"; - buildInputs = [x11 ncurses]; + buildInputs = [xlibsWrapper ncurses]; installTargets = "install installopt"; patchPhase = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index ce61e56213905..c62a8151ef786 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = stdenv.isi686 || stdenv.isx86_64; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { ]; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; prePatch = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index e6ed6f4b73edc..e9073a42cf0c4 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = !stdenv.isArm && !stdenv.isMips; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ]; preConfigure = '' diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index f8a7ed920a52f..b366f20ffb6ef 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = !stdenv.isArm && !stdenv.isMips; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; preConfigure = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix index 882af287c0452..6c2bc8cb9ca7b 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = stdenv.isi686 || stdenv.isx86_64; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ]; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "core coreboot all"; # "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installFlags = "-i"; installTargets = "install"; # + optionalString useNativeCompilers " installopt"; prePatch = '' diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index 9b340f69e90b0..6eca566dd2cd0 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, ncurses }: +{ stdenv, fetchurl, xlibsWrapper, ncurses }: stdenv.mkDerivation (rec { @@ -10,9 +10,9 @@ stdenv.mkDerivation (rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk" "-x11lib" x11]; + configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; buildFlags = "world bootstrap world.opt"; - buildInputs = [x11 ncurses]; + buildInputs = [xlibsWrapper ncurses]; installTargets = "install installopt"; patchPhase = '' CAT=$(type -tp cat) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f9f628dab60ad..a0fdea2fc563d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -60530,13 +60530,13 @@ self: { }) {}; "gtk-traymanager" = callPackage - ({ mkDerivation, base, glib, gtk, x11 }: + ({ mkDerivation, base, glib, gtk, xlibsWrapper }: mkDerivation { pname = "gtk-traymanager"; version = "0.1.5"; sha256 = "1582e229aafe22cf5499fe1519e2ff4f49cecbe83a6eb1a8de04f45dd44df443"; libraryHaskellDepends = [ base glib gtk ]; - libraryPkgconfigDepends = [ x11 ]; + libraryPkgconfigDepends = [ xlibsWrapper ]; homepage = "http://github.com/travitch/gtk-traymanager"; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index f5cf11ead970c..fe209f6f11489 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi -, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11 +, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, xlibsWrapper, libX11 , makeWrapper, callPackage, self }: assert zlibSupport -> zlib != null; @@ -21,7 +21,7 @@ let sha256 = "0xympj874cnjpxj68xm5gllq2f8bbvz8hr0md8mh1yd6fgzzxibh"; }; - buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ] + buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional zlibSupport zlib; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 28f53f8ca95f2..32974778168b5 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false -, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, self, callPackage }: +, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage }: assert zlibSupport -> zlib != null; @@ -49,7 +49,7 @@ let buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ - [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ] + [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ] ++ optional zlibSupport zlib; @@ -198,7 +198,7 @@ let tkinter = buildInternalPythonModule { moduleName = "tkinter"; - deps = [ tcl tk x11 ]; + deps = [ tcl tk xlibsWrapper ]; }; readline = buildInternalPythonModule { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 195caa583ad46..6f951bc28370e 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -5,7 +5,7 @@ , db, gdbm, ncurses, sqlite, readline -, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? !stdenv.isCygwin +, tcl ? null, tk ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? !stdenv.isCygwin , zlib ? null, zlibSupport ? true , expat, libffi @@ -15,7 +15,7 @@ assert zlibSupport -> zlib != null; assert x11Support -> tcl != null && tk != null - && x11 != null + && xlibsWrapper != null && libX11 != null; with stdenv.lib; @@ -92,7 +92,7 @@ let ++ optionals stdenv.isCygwin [ expat libffi ] ++ optionals includeModules ( [ db gdbm ncurses sqlite readline - ] ++ optionals x11Support [ tcl tk x11 libX11 ] + ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] ) ++ optional zlibSupport zlib @@ -249,7 +249,7 @@ let tkinter = if stdenv.isCygwin then null else (buildInternalPythonModule { moduleName = "tkinter"; - deps = [ tcl tk x11 libX11 ]; + deps = [ tcl tk xlibsWrapper libX11 ]; }); } // { diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 1fae5d42ab7e1..ac895b5113edc 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, audiofile, libcap , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null -, x11Support ? true, x11 ? null, libXrandr ? null +, x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -10,7 +10,7 @@ assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport; assert openglSupport -> (mesa != null && x11Support); -assert x11Support -> (x11 != null && libXrandr != null); +assert x11Support -> (xlibsWrapper != null && libXrandr != null); assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> libpulseaudio != null; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. propagatedBuildInputs = - optionals x11Support [ x11 libXrandr ] ++ + optionals x11Support [ xlibsWrapper libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ optional openglSupport mesa ++ diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index f5bd144a7172f..7573d1e1cd29c 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, audiofile , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null -, x11Support ? true, x11 ? null, libXrandr ? null +, x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -10,7 +10,7 @@ assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support); -assert x11Support -> (x11 != null && libXrandr != null); +assert x11Support -> (xlibsWrapper != null && libXrandr != null); assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> libpulseaudio != null; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. - propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ + propagatedBuildInputs = stdenv.lib.optionals x11Support [ xlibsWrapper libXrandr ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; buildInputs = [ pkgconfig audiofile ] ++ diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 454c4e882f56c..6084e7074fe43 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}: +{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}: stdenv.mkDerivation { name = "Xaw3d-1.5E"; @@ -8,8 +8,8 @@ stdenv.mkDerivation { md5 = "29ecfdcd6bcf47f62ecfd672d31269a1"; }; patches = [./config.patch ./laylex.patch]; - buildInputs = [x11 imake gccmakedep libXmu libXpm libXp bison flex]; - propagatedBuildInputs = [x11 libXmu]; + buildInputs = [imake gccmakedep libXpm libXp bison flex]; + propagatedBuildInputs = [xlibsWrapper libXmu]; meta = { description = "3D widget set based on the Athena Widget set"; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index b8e9fd7966b04..97636f7a9574e 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, cairo, x11, fontconfig, freetype, libsigcxx }: +{ fetchurl, stdenv, pkgconfig, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: stdenv.mkDerivation rec { name = "cairomm-1.11.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ]; + propagatedBuildInputs = [ cairo xlibsWrapper fontconfig freetype libsigcxx ]; meta = with stdenv.lib; { description = "A 2D graphics library with support for multiple output devices"; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 0d262fb061e29..8a24445dcca7c 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, x11 }: +{ stdenv, fetchurl, cmake, xlibsWrapper }: stdenv.mkDerivation rec { version = "18.10"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - buildInputs = [ cmake x11 ]; - propagatedBuildInputs = [ x11 ]; + buildInputs = [ cmake xlibsWrapper ]; + propagatedBuildInputs = [ xlibsWrapper ]; meta = with stdenv.lib; { description = "A general purpose cross-platform C++ machine learning library"; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index d51419f37540d..6398e5542ac33 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi +{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }: let inherit (composableDerivation) edf; in @@ -11,7 +11,7 @@ composableDerivation.composableDerivation {} rec { sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih"; }; - propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; + propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ]; buildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix index a5b65f09e613d..cb71724a36045 100644 --- a/pkgs/development/libraries/fltk/fltk13.nix +++ b/pkgs/development/libraries/fltk/fltk13.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi +{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng , cfg ? {} , automake, autoconf, libtool @@ -21,7 +21,7 @@ composableDerivation.composableDerivation {} { --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand' ''; - propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; + propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ]; enableParallelBilding = true; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index dfd2c75184ee8..2d44444ab40de 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }: +{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }: let version = "1.7.9"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; }; - buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; + buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; doCheck = true; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index e966388b2ad96..3c823adf91b6d 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor +{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor , libXrandr, mesa, libXft, libXfixes, xinput }: let @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n"; }; - buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr + buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft mesa libXfixes xinput ]; doCheck = true; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 6159ce7c9e0a4..368a1e2748788 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11, cmake }: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, xlibsWrapper, cmake }: let version = "3.0.0"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ in stdenv.mkDerivation { sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra"; }; - buildInputs = [ libXi libXrandr libXxf86vm mesa x11 cmake ]; + buildInputs = [ libXi libXrandr libXxf86vm mesa xlibsWrapper cmake ]; meta = with stdenv.lib; { description = "Create and manage windows containing OpenGL contexts"; diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index 3ae649b67902a..b6e515fef8030 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, imlib2 }: +{ stdenv, fetchurl, xlibsWrapper, imlib2 }: stdenv.mkDerivation rec { name = "giblib-1.2.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; }; - buildInputs = [x11 imlib2]; + buildInputs = [xlibsWrapper imlib2]; meta = { homepage = http://linuxbrit.co.uk/giblib/; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 5127311e7c919..cbdc28311877e 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }: +{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi }: with stdenv.lib; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1mhkllxz49l1x680dmzrv2i82qjrq017sykah3xc90f2d8qcxfv9"; }; - nativeBuildInputs = [ x11 libXmu libXi ]; + nativeBuildInputs = [ xlibsWrapper libXmu libXi ]; propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h patchPhase = '' diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 087be3bb6de0a..02d26759834cf 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11 +{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper , libXinerama, libXcursor }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ - cmake mesa libXrandr libXi libXxf86vm libXfixes x11 + cmake mesa libXrandr libXi libXxf86vm libXfixes xlibsWrapper libXinerama libXcursor ]; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index fec9d16cf959a..01f7b6e1065df 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs -, gdk_pixbuf, libintlOrEmpty, x11 +, gdk_pixbuf, libintlOrEmpty, xlibsWrapper , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ++ optionals (stdenv.isLinux || stdenv.isDarwin) [ libXrandr libXrender libXcomposite libXi libXcursor ] - ++ optionals stdenv.isDarwin [ x11 libXdamage ] + ++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ] ++ libintlOrEmpty ++ optional xineramaSupport libXinerama ++ optionals cupsSupport [ cups ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 5fb70ac05ea9f..6fd583e7fee78 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gettext, perl , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xlibs, x11, wayland, libxkbcommon, epoxy +, xlibs, xlibsWrapper, wayland, libxkbcommon, epoxy , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null }: diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 50703f907d347..3ff608a4ac330 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: +{ stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: stdenv.mkDerivation rec { name = "imlib2-1.4.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0x1j0ylpclkp8cfpwfpkjywqz124bqskyxbw8pvwzkv2gmrbwldg"; }; - buildInputs = [ x11 libjpeg libtiff giflib libpng bzip2 ]; + buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 4513530e6f09b..a2e5d153060bd 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, x11, python3, libxslt }: +{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3, libxslt }: stdenv.mkDerivation rec { name = "lirc-0.9.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preBuild = "patchShebangs ."; - buildInputs = [ alsaLib help2man pkgconfig x11 python3 libxslt ]; + buildInputs = [ alsaLib help2man pkgconfig xlibsWrapper python3 libxslt ]; configureFlags = [ "--with-driver=devinput" diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 87187667a922c..2db67041ec347 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, glib, cairo, libpng, harfbuzz , fontconfig, freetype, libintlOrEmpty, gobjectIntrospection }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isDarwin [ fontconfig ]; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; + propagatedBuildInputs = [ xlibsWrapper glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 872576d9fb02b..2c07c1e085801 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -26,7 +26,7 @@ # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11. , mesa ? null -, x11 ? null +, xlibsWrapper ? null , libXmu ? null }: @@ -41,7 +41,7 @@ assert enableXM -> motif != null; # OpenGL/X11 User Interface and Visualisation drivers. assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> mesa != null; -assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> x11 != null; +assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper != null; assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null; let @@ -81,8 +81,8 @@ let }; enableParallelBuilding = true; - buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa x11 libXmu ]; - propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa x11 libXmu ]; + buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; + propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index ffad441881543..08d8f141deb0b 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -7,7 +7,7 @@ , threadSupport ? true , mysqlSupport ? false, mysql ? null , openglSupport ? false, mesa ? null, libXmu ? null -, x11, xextproto, zlib, libjpeg, libpng, which +, xlibsWrapper, xextproto, zlib, libjpeg, libpng, which }: assert xftSupport -> libXft != null; @@ -30,7 +30,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ which ]; - propagatedBuildInputs = [libpng x11 libXft libXrender zlib libjpeg]; + propagatedBuildInputs = [libpng xlibsWrapper libXft libXrender zlib libjpeg]; configureFlags = " -v diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index d7a0b11a8daba..ef2db5ae5a6af 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -1,6 +1,6 @@ # alsaLib vorbisTools python can be made optional -{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, x11 }: +{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, xlibsWrapper }: stdenv.mkDerivation { name = "snack-2.2.10"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { postUnpack = ''sourceRoot="$sourceRoot/unix"''; - buildInputs = [ python tcl tk vorbisTools pkgconfig x11 ]; + buildInputs = [ python tcl tk vorbisTools pkgconfig xlibsWrapper ]; postInstall = "aoeu"; diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index 37026ad934435..eb1c01e4eeffe 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, x11 }: +{ stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "gl"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pure freeglut mesa x11 ]; + propagatedBuildInputs = [ pure freeglut mesa xlibsWrapper ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix index b36a58279fa3f..0fe1667b04067 100644 --- a/pkgs/development/pure-modules/tk/default.nix +++ b/pkgs/development/pure-modules/tk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, x11 }: +{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "tk"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pure tcl tk x11 ]; + propagatedBuildInputs = [ pure tcl tk xlibsWrapper ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 0589bec36b956..cb93ccc2b581e 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, x11, isPyPy }: +{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, xlibsWrapper, isPyPy }: if isPyPy then throw "pycairo not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { version = "1.10.0"; @@ -23,7 +23,7 @@ if isPyPy then throw "pycairo not supported for interpreter ${python.executable} sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4"; }; - buildInputs = [ python pkgconfig cairo x11 ]; + buildInputs = [ python pkgconfig cairo xlibsWrapper ]; configurePhase = '' ( diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 62d39d768f9fa..2d1c1566185a4 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -289,7 +289,7 @@ let rgdal = [ pkgs.proj pkgs.gdal ]; rgeos = [ pkgs.geos ]; rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ]; - rgl = [ pkgs.mesa pkgs.x11 ]; + rgl = [ pkgs.mesa pkgs.xlibsWrapper ]; Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2 ]; Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 76aed3f2cc6ac..681fec72f969d 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, x11, mesa, SDL, openal, freealut, libogg, libvorbis }: +{ fetchurl, stdenv, cmake, xlibsWrapper, mesa, SDL, openal, freealut, libogg, libvorbis }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rkz6lwjcd5mwv72kf07ghvx6z46kf3xs250mjbmnmjpn7r5sxwv"; }; - buildInputs = [ cmake x11 mesa SDL openal freealut libogg libvorbis ]; + buildInputs = [ cmake xlibsWrapper mesa SDL openal freealut libogg libvorbis ]; buildPhase = '' cmake ./ diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 72673ea010c61..850b1d391c548 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp -, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite, luajit, freetype +, libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, sqlite, luajit, freetype , gettext }: @@ -31,7 +31,7 @@ in stdenv.mkDerivation { buildInputs = [ cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa - openal libvorbis x11 sqlite luajit freetype gettext + openal libvorbis xlibsWrapper sqlite luajit freetype gettext ]; postInstall = '' diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix index ed447004345ee..2ad922834d38b 100644 --- a/pkgs/games/quake3/game/default.nix +++ b/pkgs/games/quake3/game/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, x11, SDL, mesa, openal, gcc46 }: +{ lib, stdenv, fetchurl, xlibsWrapper, SDL, mesa, openal, gcc46 }: stdenv.mkDerivation { name = "ioquake3-1.36"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ./botlib.patch ]; - buildInputs = [ x11 SDL mesa openal gcc46 ]; + buildInputs = [ xlibsWrapper SDL mesa openal gcc46 ]; # Fix building on GCC 4.6. NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index 7d96829f12b52..4c0c76d60b8c6 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite -, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, pkgconfig }: +, libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { name = "voxelands-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake irrlicht libpng bzip2 libjpeg sqlite - libXxf86vm mesa openal libvorbis x11 pkgconfig + libXxf86vm mesa openal libvorbis xlibsWrapper pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index cb9974580d870..1ce2abf79b878 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, expat, x11, freetype }: +{ stdenv, fetchurl, perl, expat, xlibsWrapper, freetype }: # !!! assert freetype == xlibs.freetype @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj"; }; - buildInputs = [ perl expat x11 freetype ]; + buildInputs = [ perl expat xlibsWrapper freetype ]; # Zoom doesn't add the right directory in the include path. CFLAGS = [ "-I" (freetype + "/include/freetype2") ]; diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 32d47093d68cf..c1ff6cb949348 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, x11, libpulseaudio}: +{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, xlibsWrapper, libpulseaudio}: stdenv.mkDerivation rec { name = "snes9x-gtk-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3"; }; - buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 x11 libpulseaudio]; + buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 xlibsWrapper libpulseaudio]; sourceRoot = "snes9x-${version}-src/gtk"; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 4d9d9cedde595..9f930900c4108 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, expat, openssl , libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec , libiconv -, x11Support ? false, x11 ? null +, x11Support ? false, xlibsWrapper ? null , cupsSupport ? false, cups ? null }: -assert x11Support -> x11 != null; +assert x11Support -> xlibsWrapper != null; assert cupsSupport -> cups != null; let version = "9.15"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec libiconv ] - ++ stdenv.lib.optional x11Support x11 + ++ stdenv.lib.optional x11Support xlibsWrapper ++ stdenv.lib.optional cupsSupport cups # [] # maybe sometimes jpeg2000 support ; diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 56d176a710cd5..606a4200d0eb5 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, x11, libXext, mesa, imagemagick, libtiff, bzip2}: +{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, mesa, imagemagick, libtiff, bzip2}: stdenv.mkDerivation rec { version = "0.9.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg"; }; - buildInputs = [ pkgconfig mesa x11 imagemagick libtiff bzip2 ]; + buildInputs = [ pkgconfig mesa xlibsWrapper imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index 114d745f140a5..b40827e7bfbc6 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, imake, libXScrnSaver, scrnsaverproto}: +{stdenv, fetchurl, xlibsWrapper, imake, libXScrnSaver, scrnsaverproto}: stdenv.mkDerivation rec { @@ -11,5 +11,5 @@ stdenv.mkDerivation rec makeFlags="BINDIR=\${out}/bin MANPATH=\${out}/man"; preBuild = "xmkmf"; installTargets = "install install.man"; - buildInputs = [x11 imake libXScrnSaver scrnsaverproto]; + buildInputs = [xlibsWrapper imake libXScrnSaver scrnsaverproto]; } diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index 16a6622aa22dc..1f12ffa93015e 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python, pkgconfig, x11, pam }: +{ stdenv, fetchgit, python, pkgconfig, xlibsWrapper, pam }: stdenv.mkDerivation { name = "xtrlock-pam-3.4-post-20150909"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "fa8aeedfa2a4e1d813f8cad562bafdd4e2c5130df0a7cde7b2f956a32044e9f8"; }; - buildInputs = [ python pkgconfig x11 pam ]; + buildInputs = [ python pkgconfig xlibsWrapper pam ]; configurePhase = '' substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 60bfe0930171f..b857d5ece451c 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -9,7 +9,7 @@ # optional features with extra dependencies , ncursesSupport ? true , ncurses ? null -, x11Support ? true , x11 ? null +, x11Support ? true , xlibsWrapper ? null , xdamageSupport ? x11Support, libXdamage ? null , imlib2Support ? x11Support, imlib2 ? null @@ -29,7 +29,7 @@ assert ncursesSupport -> ncurses != null; -assert x11Support -> x11 != null; +assert x11Support -> xlibsWrapper != null; assert xdamageSupport -> x11Support && libXdamage != null; assert imlib2Support -> x11Support && imlib2 != null; assert luaSupport -> lua != null; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib cmake ] ++ optional ncursesSupport ncurses - ++ optional x11Support x11 + ++ optional x11Support xlibsWrapper ++ optional xdamageSupport libXdamage ++ optional imlib2Support imlib2 ++ optional luaSupport lua diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index fb18907c50fff..96a4ac16c9b15 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit -, x11, mesa +, xlibsWrapper, mesa , nvidia }: let @@ -15,6 +15,6 @@ stdenv.mkDerivation { inherit nvidia mesa; - buildInputs = [ x11 mesa ]; + buildInputs = [ xlibsWrapper mesa ]; builder = ./builder.sh; } diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 8f21f6558ffc4..eda19b7a5bfab 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, x11, pkgconfig }: +{ stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { version = "0.7.5"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh --with-gui=X11"; - buildInputs = [ inputproto libXi autoconf automake libtool m4 x11 pkgconfig ]; + buildInputs = [ inputproto libXi autoconf automake libtool m4 xlibsWrapper pkgconfig ]; meta = { homepage = https://github.com/tias/xinput_calibrator; diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index a1a091a90cca7..22b8a607fd347 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu +{ stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu , libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { inherit xauth fontDirectories perl; gcc = stdenv.cc.cc; - buildInputs = [ x11 zlib libjpeg imake gccmakedep libXmu libXaw + buildInputs = [ xlibsWrapper zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp xauth openssh ]; patchPhase = '' diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index d214a75b44161..01c6501f8409a 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig -, gnome3, avahi, gtk3, libnotify, libpulseaudio, x11}: +, gnome3, avahi, gtk3, libnotify, libpulseaudio, xlibsWrapper}: stdenv.mkDerivation rec { name = "pasystray-0.5.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake makeWrapper pkgconfig gnome3.defaultIconTheme - avahi gtk3 libnotify libpulseaudio x11 ]; + avahi gtk3 libnotify libpulseaudio xlibsWrapper ]; preConfigure = '' aclocal diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index d0235c5bade47..35bc1e610de75 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, mesa}: +{stdenv, fetchurl, xlibsWrapper, mesa}: let version = "8.1.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0a58hw5850731p4smz4zqsbvyxvgjf7n5xdbs9l1wamk8q3gl0wp"; }; - buildInputs = [x11 mesa]; + buildInputs = [xlibsWrapper mesa]; configurePhase = "true"; diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index fcc06871ef152..04fff8053819a 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw , yacc, libtool, fontconfig, pango, gd }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c"; }; - buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; + buildInputs = [pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; configureFlags = [ "--with-pngincludedir=${libpng}/include" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--with-expatincludedir=${expat}/include" "--with-expatlibdir=${expat}/lib" ] - ++ stdenv.lib.optional (x11 == null) "--without-x"; + ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x"; meta = { description = "A program for visualising graphs"; diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 411e2fb45c87b..aa8958bb63df3 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, giblib, x11 }: +{ stdenv, fetchurl, giblib, xlibsWrapper }: stdenv.mkDerivation rec { name = "scrot-0.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1"; }; - buildInputs = [ giblib x11 ]; + buildInputs = [ giblib xlibsWrapper ]; meta = { homepage = http://linuxbrit.co.uk/scrot/; diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index d97ba727bae59..00f08ee074270 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11}: +{stdenv, fetchurl, xlibsWrapper}: stdenv.mkDerivation { name = "unclutter-8"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; }; - buildInputs = [x11]; + buildInputs = [xlibsWrapper]; installPhase = '' mkdir -pv "$out/bin" diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 20d5e66cfa24c..3f616fdad681d 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, x11, libXmu, autoconf, automake, libtool }: +{ stdenv, fetchsvn, xlibsWrapper, libXmu, autoconf, automake, libtool }: stdenv.mkDerivation rec { # The last release from 2012, 0.12, lacks '-targets' @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = "autoreconf -vfi"; - buildInputs = [ x11 libXmu autoconf automake libtool ]; + buildInputs = [ xlibsWrapper libXmu autoconf automake libtool ]; meta = { description = "Tool to access the X clipboard from a console application"; diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 74eadaf5e2e97..3fe0f409f29bf 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11}: +{stdenv, fetchurl, xlibsWrapper}: stdenv.mkDerivation { name = "xsel-1.2.0"; @@ -7,5 +7,5 @@ stdenv.mkDerivation { sha256 = "070lbcpw77j143jrbkh0y1v10ppn1jwmjf92800w7x42vh4cw9xr"; }; - buildInputs = [x11]; + buildInputs = [xlibsWrapper]; } diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index 5088d92a8c7f2..88e7f1aec5a9c 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, imake}: +{stdenv, fetchurl, xlibsWrapper, imake}: stdenv.mkDerivation { name = "x11-ssh-askpass-1.2.4.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildPhase = "xmkmf; make includes; make"; - buildInputs = [x11 imake]; + buildInputs = [xlibsWrapper imake]; meta = { homepage = "http://www.jmknoble.net/software/x11-ssh-askpass/"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6c80901789c18..838e5353b2f72 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12163,7 +12163,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SM/SMCCAM/${name}.tar.gz"; sha256 = "1dq89bh6fqv7l5mbffqcismcljpq5f869bx7g8lg698zgindv5ny"; }; - buildInputs = [pkgs.x11]; + buildInputs = [pkgs.xlibsWrapper]; NIX_CFLAGS_LINK = "-lX11"; doCheck = false; # requires an X server }; @@ -12174,7 +12174,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/C/CT/CTRONDLP/${name}.tar.gz"; sha256 = "0jznws68skdzkhgkgcgjlj40qdyh9i75r7fw8bqzy406f19xxvnw"; }; - buildInputs = [pkgs.x11 pkgs.xorg.libXtst pkgs.xorg.libXi]; + buildInputs = [pkgs.xlibsWrapper pkgs.xorg.libXtst pkgs.xorg.libXi]; NIX_CFLAGS_LINK = "-lX11 -lXext -lXtst"; doCheck = false; # requires an X server }; |