commit 21e3ff658ac2d7b7986169f31550aa5f65bb7635 · pyrox.dev/nixpkgs

+2 -2

pkgs/applications/audio/qmmp/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, cmake, qt4, pkgconfig, x11

     

       1
       1
       +
       { stdenv, fetchurl, cmake, qt4, pkgconfig, xlibsWrapper

     

       2
       2
        
       # transports

     

       3
       3
        
       , curl, libmms

     

       4
       4
        
       # input plugins

     
···

       37
       37
        
       

     

       38
       38
        
         buildInputs =

     

       39
       39
        
           [ # basic requirements

     

       40
       40
       -
             cmake qt4 pkgconfig x11

     

       40
       40
       +
             cmake qt4 pkgconfig xlibsWrapper

     

       41
       41
        
             # transports

     

       42
       42
        
             curl libmms

     

       43
       43
        
             # input plugins

+1 -1

pkgs/applications/display-managers/lightdm/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2

     

       2
       2
       -
       , intltool, x11, libxklavier, libgcrypt

     

       2
       2
       +
       , intltool, xlibsWrapper, libxklavier, libgcrypt

     

       3
       3
        
       , qt4 ? null, qt5 ? null

     

       4
       4
        
       }:

     

       5
       5

+2 -2

pkgs/applications/editors/emacs-24/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d

     

       1
       1
       +
       { stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d

     

       2
       2
        
       , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif

     

       3
       3
        
       , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls

     

       4
       4
        
       , alsaLib, cairo, acl, gpm

     
···

       43
       43
        
           [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext ]

     

       44
       44
        
           ++ stdenv.lib.optional stdenv.isLinux dbus

     

       45
       45
        
           ++ stdenv.lib.optionals withX

     

       46
       46
       -
             [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft

     

       46
       46
       +
             [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft

     

       47
       47
        
               imagemagick gconf ]

     

       48
       48
        
           ++ stdenv.lib.optional (withX && withGTK2) gtk2

     

       49
       49
        
           ++ stdenv.lib.optional (withX && withGTK3) gtk3

+2 -2

pkgs/applications/editors/nedit/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, x11, motif, libXpm }:

     

       1
       1
       +
       { stdenv, fetchurl, xlibsWrapper, motif, libXpm }:

     

       2
       2
        
       

     

       3
       3
        
       assert stdenv.isLinux;

     

       4
       4
        
       

     
···

       10
       10
        
           sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ x11 motif libXpm ];

     

       13
       13
       +
         buildInputs = [ xlibsWrapper motif libXpm ];

     

       14
       14
        
       

     

       15
       15
        
         buildFlags = if stdenv.isLinux then "linux" else "";

     

       16
       16

+2 -2

pkgs/applications/gis/qgis/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl,

     

       1
       1
       +
       { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl,

     

       2
       2
        
         qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "qgis-2.10.1";

     

       6
       6
        
       

     

       7
       7
       -
         buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl qwt qscintilla

     

       7
       7
       +
         buildInputs = [ gdal qt4 flex bison proj geos xlibsWrapper sqlite gsl qwt qscintilla

     

       8
       8
        
           fcgi libspatialindex libspatialite postgresql ] ++

     

       9
       9
        
           (with pythonPackages; [ numpy psycopg2 ]) ++ [ pythonPackages.qscintilla ];

     

       10
       10

+2 -2

pkgs/applications/graphics/feh/default.nix

···

       1
       1
       -
       { stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng

     

       1
       1
       +
       { stdenv, makeWrapper, fetchurl, xlibsWrapper, imlib2, libjpeg, libpng

     

       2
       2
        
       , libXinerama, curl, libexif }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       9
       9
        
           sha256 = "1059mflgw8hl398lwy55fj50a98xryvdf23wkpbn4s0z9388hl46";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ makeWrapper x11 imlib2 libjpeg libpng libXinerama curl libexif ];

     

       12
       12
       +
         buildInputs = [ makeWrapper xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ];

     

       13
       13
        
       

     

       14
       14
        
         preBuild = ''

     

       15
       15
        
           makeFlags="PREFIX=$out exif=1"

+2 -2

pkgs/applications/graphics/xfig/default.nix

···

       1
       1
        
       { stdenv, fetchurl, makeWrapper, imake

     

       2
       2
       -
       , x11, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}:

     

       2
       2
       +
       , xlibsWrapper, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}:

     

       3
       3
        
       

     

       4
       4
        
       let version = "3.2.5b"; in

     

       5
       5
        
       stdenv.mkDerivation {

     
···

       12
       12
        
       

     

       13
       13
        
         builder = ./builder.sh;

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg];

     

       15
       15
       +
         buildInputs = [xlibsWrapper libXpm libXmu libXi libXp Xaw3d libpng libjpeg];

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ imake makeWrapper ];

     

       18
       18

+2 -2

pkgs/applications/misc/synergy/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, cmake, x11, libX11, libXi, libXtst, libXrandr

     

       1
       1
       +
       { stdenv, fetchFromGitHub, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr

     

       2
       2
        
       , xinput, curl, openssl, unzip }:

     

       3
       3
        
       

     

       4
       4
        
       with stdenv.lib;

     
···

       37
       37
        
         '';

     

       38
       38
        
       

     

       39
       39
        
         buildInputs = [

     

       40
       40
       -
           cmake x11 libX11 libXi libXtst libXrandr xinput curl openssl

     

       40
       40
       +
           cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl

     

       41
       41
        
         ];

     

       42
       42
        
       

     

       43
       43
        
         installPhase = ''

+2 -2

pkgs/applications/misc/wordnet/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, tcl, tk, x11, makeWrapper}:

     

       1
       1
       +
       {stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}:

     

       2
       2
        
       

     

       3
       3
        
       let version = "3.0"; in

     

       4
       4
        
       stdenv.mkDerivation {

     
···

       8
       8
        
           sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [tcl tk x11 makeWrapper];

     

       11
       11
       +
         buildInputs = [tcl tk xlibsWrapper makeWrapper];

     

       12
       12
        
       

     

       13
       13
        
         patchPhase = ''

     

       14
       14
        
           sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c

+2 -2

pkgs/applications/misc/xfe/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fox, pkgconfig, gettext, x11, gcc, intltool, file, libpng }:

     

       1
       1
       +
       { stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "xfe-1.37";

     
···

       8
       8
        
           sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ fox pkgconfig gettext x11 gcc intltool file libpng ];

     

       11
       11
       +
         buildInputs = [ fox pkgconfig gettext xlibsWrapper gcc intltool file libpng ];

     

       12
       12
        
       

     

       13
       13
        
         preConfigure = ''

     

       14
       14
        
           sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h

+3 -3

pkgs/applications/misc/xpdf/default.nix

···

       1
       1
        
       { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false

     

       2
       2
       -
       , stdenv, fetchurl, zlib, libpng, x11 ? null, motif ? null, freetype ? null, t1lib ? null

     

       2
       2
       +
       , stdenv, fetchurl, zlib, libpng, xlibsWrapper ? null, motif ? null, freetype ? null, t1lib ? null

     

       3
       3
        
       , base14Fonts ? null

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
       -
       assert enableGUI -> x11 != null && motif != null && freetype != null;

     

       6
       6
       +
       assert enableGUI -> xlibsWrapper != null && motif != null && freetype != null;

     

       7
       7
        
       assert enablePDFtoPPM -> freetype != null;

     

       8
       8
        
       assert useT1Lib -> t1lib != null;

     

       9
       9
        
       

     
···

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         buildInputs = [ zlib libpng ] ++

     

       21
       21
       -
           stdenv.lib.optionals enableGUI [x11 motif] ++

     

       21
       21
       +
           stdenv.lib.optionals enableGUI [xlibsWrapper motif] ++

     

       22
       22
        
           stdenv.lib.optional useT1Lib t1lib ++

     

       23
       23
        
           stdenv.lib.optional enablePDFtoPPM freetype;

     

       24
       24

+2 -2

pkgs/applications/networking/browsers/elinks/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, perl, ncurses, x11, bzip2, zlib, openssl

     

       1
       1
       +
       { stdenv, fetchurl, perl, ncurses, xlibsWrapper, bzip2, zlib, openssl

     

       2
       2
        
       , spidermonkey, gpm

     

       3
       3
        
       , enableGuile ? false, guile ? null   # Incompatible licenses, LGPLv3 - GPLv2

     

       4
       4
        
       , enablePython ? false, python ? null

     
···

       17
       17
        
       

     

       18
       18
        
         patches = [ ./gc-init.patch ];

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ]

     

       20
       20
       +
         buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ]

     

       21
       21
        
           ++ stdenv.lib.optional enableGuile guile

     

       22
       22
        
           ++ stdenv.lib.optional enablePython python;

     

       23
       23

+2 -2

pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, xlibsWrapper

     

       2
       2
        
       , GConf, gnome_mplayer, mplayer, gmtk

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       10
       10
        
           sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ pkgconfig glib dbus dbus_glib browser x11 GConf browser gmtk ];

     

       13
       13
       +
         buildInputs = [ pkgconfig glib dbus dbus_glib browser xlibsWrapper GConf browser gmtk ];

     

       14
       14
        
       

     

       15
       15
        
         # !!! fix this

     

       16
       16
        
         preBuild =

+3 -3

pkgs/applications/networking/browsers/w3m/default.nix

···

       3
       3
        
       , graphicsSupport ? false

     

       4
       4
        
       , mouseSupport ? false

     

       5
       5
        
       , ncurses, openssl ? null, boehmgc, gettext, zlib

     

       6
       6
       -
       , imlib2 ? null, x11 ? null, fbcon ? null

     

       6
       6
       +
       , imlib2 ? null, xlibsWrapper ? null, fbcon ? null

     

       7
       7
        
       , gpm-ncurses ? null

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       assert sslSupport -> openssl != null;

     

       11
       11
       -
       assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null);

     

       11
       11
       +
       assert graphicsSupport -> imlib2 != null && (xlibsWrapper != null || fbcon != null);

     

       12
       12
        
       assert mouseSupport -> gpm-ncurses != null;

     

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     
···

       28
       28
        
         buildInputs = [ncurses boehmgc gettext zlib]

     

       29
       29
        
           ++ stdenv.lib.optional sslSupport openssl

     

       30
       30
        
           ++ stdenv.lib.optional mouseSupport gpm-ncurses

     

       31
       31
       -
           ++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon];

     

       31
       31
       +
           ++ stdenv.lib.optionals graphicsSupport [imlib2 xlibsWrapper fbcon];

     

       32
       32
        
       

     

       33
       33
        
         configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"

     

       34
       34
        
           + stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb";

+2 -2

pkgs/applications/networking/instant-messengers/amsn/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}:

     

       1
       1
       +
       {stdenv, fetchurl, which, tcl, tk, xlibsWrapper, libpng, libjpeg, makeWrapper}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "amsn-0.98.9";

     
···

       9
       9
        
       

     

       10
       10
        
         configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static";

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [which tcl tk x11 libpng libjpeg makeWrapper];

     

       12
       12
       +
         buildInputs = [which tcl tk xlibsWrapper libpng libjpeg makeWrapper];

     

       13
       13
        
       

     

       14
       14
        
         postInstall = ''

     

       15
       15
        
           wrapProgram $out/bin/amsn --prefix PATH : ${tk}/bin

+2 -2

pkgs/applications/networking/instant-messengers/tkabber/default.nix

···

       1
       1
        
       { stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg

     

       2
       2
       -
       , bwidget, makeWrapper, x11

     

       2
       2
       +
       , bwidget, makeWrapper, xlibsWrapper

     

       3
       3
        
       , withSitePlugins ? true

     

       4
       4
        
       , theme ? null

     

       5
       5
        
       }:

     
···

       62
       62
        
           done

     

       63
       63
        
         '';

     

       64
       64
        
       

     

       65
       65
       -
         buildInputs = [ tcl tk x11 makeWrapper ] ++ tclLibraries;

     

       65
       65
       +
         buildInputs = [ tcl tk xlibsWrapper makeWrapper ] ++ tclLibraries;

     

       66
       66
        
       

     

       67
       67
        
         meta = {

     

       68
       68
        
           homepage = "http://tkabber.jabber.ru/";

+3 -7

pkgs/applications/science/math/scilab/default.nix

···

       8
       8
        
       , ocaml, withOCaml ? false

     

       9
       9
        
       #, withJava ? false

     

       10
       10
        
       #, atlasMath, withAtlas ? false

     

       11
       11
       -
       , x11, withX ? false

     

       11
       11
       +
       , xlibsWrapper, withX ? false

     

       12
       12
        
       }:

     

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     
···

       23
       23
        
         buildInputs = [gfortran ncurses]

     

       24
       24
        
         ++ lib.optionals withGtk [gtk]

     

       25
       25
        
         ++ lib.optionals withOCaml [ocaml]

     

       26
       26
       -
         ++ lib.optionals withX [x11]

     

       26
       26
       +
         ++ lib.optional withX xlibsWrapper

     

       27
       27
        
         ;

     

       28
       28
        
       

     

       29
       29
        
       

     
···

       58
       58
        
         # do not compile Java interface

     

       59
       59
        
         + " --without-java"

     

       60
       60
        
         # use the X Window System

     

       61
       61
       -
         + (lib.optionalString withX "

     

       62
       62
       -
             --with-x

     

       63
       63
       -
             --x-libraries=${x11}/lib

     

       64
       64
       -
             --x-includes=${x11}/include

     

       65
       65
       -
           ")

     

       61
       61
       +
         + lib.optionalString withX "--with-x"

     

       66
       62
        
         ;

     

       67
       63
        
       

     

       68
       64
        
         makeFlags = "all";

+2 -2

pkgs/applications/video/gnash/default.nix

···

       3
       3
        
       , gst_ffmpeg, speex

     

       4
       4
        
       , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool

     

       5
       5
        
       , boost, freetype, agg, dbus, curl, pkgconfig, gettext

     

       6
       6
       -
       , glib, gtk, gtkglext, pangox_compat, x11, ming, dejagnu, python, perl

     

       6
       6
       +
       , glib, gtk, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl

     

       7
       7
        
       , freefont_ttf, haxe, swftools

     

       8
       8
        
       , lib, makeWrapper

     

       9
       9
        
       , xulrunner }:

     
···

       51
       51
        
       

     

       52
       52
        
         # XXX: KDE is supported as well so we could make it available optionally.

     

       53
       53
        
         buildInputs = [

     

       54
       54
       -
           gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good

     

       54
       54
       +
           gettext xlibsWrapper SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good

     

       55
       55
        
           gst_ffmpeg speex libtool

     

       56
       56
        
           libogg libxml2 libjpeg mesa libpng libungif boost freetype agg

     

       57
       57
        
           dbus curl pkgconfig glib gtk gtkglext pangox_compat

+2 -2

pkgs/applications/video/mythtv/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, which, qt4, x11, libpulseaudio, fftwSinglePrec

     

       1
       1
       +
       { stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec

     

       2
       2
        
       , lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig

     

       3
       3
        
       , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu

     

       4
       4
        
       , yasm, libuuid, taglib, libtool, autoconf, automake, file

     
···

       16
       16
        
         sourceRoot = "${name}/mythtv";

     

       17
       17
        
       

     

       18
       18
        
         buildInputs = [

     

       19
       19
       -
           freetype qt4 lame zlib x11 mesa perl alsaLib libpulseaudio fftwSinglePrec

     

       19
       19
       +
           freetype qt4 lame zlib xlibsWrapper mesa perl alsaLib libpulseaudio fftwSinglePrec

     

       20
       20
        
           libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu

     

       21
       21
        
           libuuid taglib

     

       22
       22
        
         ];

+2 -2

pkgs/applications/virtualization/open-vm-tools/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, makeWrapper, autoconf, automake,

     

       2
       2
        
         libmspack, openssl, pam, xercesc, icu, libdnet, procps, 

     

       3
       3
       -
         x11, libXinerama, libXi, libXrender, libXrandr, libXtst,

     

       3
       3
       +
         xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst,

     

       4
       4
        
         pkgconfig, glib, gtk, gtkmm }:

     

       5
       5
        
       

     

       6
       6
        
       let

     
···

       18
       18
        
       

     

       19
       19
        
         buildInputs = 

     

       20
       20
        
           [ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps

     

       21
       21
       -
             pkgconfig glib gtk gtkmm x11 libXinerama libXi libXrender libXrandr libXtst ];

     

       21
       21
       +
             pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ];

     

       22
       22
        
       

     

       23
       23
        
         patchPhase = ''

     

       24
       24
        
            sed -i s,-Werror,,g configure.ac

+2 -2

pkgs/applications/window-managers/ion-3/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, x11, lua, gettext, groff }:

     

       1
       1
       +
       { stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "ion-3-20090110";

     
···

       10
       10
        
           url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz;

     

       11
       11
        
           sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns";

     

       12
       12
        
         };

     

       13
       13
       -
         buildInputs = [ x11 lua gettext groff ];

     

       13
       13
       +
         buildInputs = [ xlibsWrapper lua gettext groff ];

     

       14
       14
        
         buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";

     

       15
       15
        
         installFlags = "PREFIX=\${out}";

     

       16
       16
        
       }

+2 -2

pkgs/applications/window-managers/notion/default.nix

···

       4
       4
        
         stdenv, fetchurl,

     

       5
       5
        
         lua, gettext, groff,

     

       6
       6
        
         pkgconfig, busybox,

     

       7
       7
       -
         x11, libXinerama, libXrandr, libX11

     

       7
       7
       +
         xlibsWrapper, libXinerama, libXrandr, libX11

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       assert enableXft -> libXft != null;

     
···

       26
       26
        
       

     

       27
       27
        
         patches = patches ++ stdenv.lib.optional enableXft ./notion-xft_nixos.diff;

     

       28
       28
        
         postPatch = "substituteInPlace system-autodetect.mk --replace '#PRELOAD_MODULES=1' 'PRELOAD_MODULES=1'";

     

       29
       29
       -
         buildInputs = [x11 lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft;

     

       29
       29
       +
         buildInputs = [xlibsWrapper lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft;

     

       30
       30
        
       

     

       31
       31
        
         buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";

     

       32
       32
        
         installFlags = "PREFIX=\${out}";

+2 -2

pkgs/applications/window-managers/weston/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb

     

       2
       2
       -
       , libXcursor, x11, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput

     

       2
       2
       +
       , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput

     

       3
       3
        
       , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null

     

       4
       4
        
       , libwebp ? null, xwayland ? null

     

       5
       5
        
       # beware of null defaults, as the parameters *are* supplied by callPackage by default

     
···

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = [

     

       18
       18
       -
           pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor x11 udev libdrm

     

       18
       18
       +
           pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm

     

       19
       19
        
           mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva

     

       20
       20
        
           libwebp

     

       21
       21
        
         ];

+1 -1

pkgs/desktops/enlightenment/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, x11, xlibs, dbus, imlib2, freetype }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, xlibsWrapper, xlibs, dbus, imlib2, freetype }:

     

       2
       2
        
       

     

       3
       3
        
       let version = "0.16.8.15"; in

     

       4
       4
        
         stdenv.mkDerivation {

+2 -2

pkgs/development/compilers/ocaml/3.08.0.nix

···

       1
       1
       -
       { stdenv, fetchurl, x11 }:

     

       1
       1
       +
       { stdenv, fetchurl, xlibsWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "ocaml-3.08.0";

     
···

       9
       9
        
         };

     

       10
       10
        
         configureScript = ./configure-3.08.0;

     

       11
       11
        
         dontAddPrefix = "True";

     

       12
       12
       -
         configureFlags = ["-no-tk" "-x11lib" x11];

     

       12
       12
       +
         configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];

     

       13
       13
        
         buildFlags = ["world" "bootstrap" "opt"];

     

       14
       14
        
         checkTarget = ["opt.opt"];

     

       15
       15
        
       }

+3 -3

pkgs/development/compilers/ocaml/3.10.0.nix

···

       1
       1
       -
       { stdenv, fetchurl, x11, ncurses }:

     

       1
       1
       +
       { stdenv, fetchurl, xlibsWrapper, ncurses }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation (rec {

     

       4
       4
        
       

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         prefixKey = "-prefix ";

     

       13
       13
       -
         configureFlags = ["-no-tk" "-x11lib" x11];

     

       13
       13
       +
         configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];

     

       14
       14
        
         buildFlags = "world bootstrap world.opt";

     

       15
       15
       -
         buildInputs = [x11 ncurses];

     

       15
       15
       +
         buildInputs = [xlibsWrapper ncurses];

     

       16
       16
        
         installTargets = "install installopt";

     

       17
       17
        
         patchPhase = ''

     

       18
       18
        
           CAT=$(type -tp cat)

+3 -3

pkgs/development/compilers/ocaml/3.11.2.nix

···

       1
       1
       -
       { stdenv, fetchurl, ncurses, x11 }:

     

       1
       1
       +
       { stdenv, fetchurl, ncurses, xlibsWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
          useX11 = stdenv.isi686 || stdenv.isx86_64;

     
···

       27
       27
        
           ];

     

       28
       28
        
       

     

       29
       29
        
         prefixKey = "-prefix ";

     

       30
       30
       -
         configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];

     

       30
       30
       +
         configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];

     

       31
       31
        
         buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";

     

       32
       32
       -
         buildInputs = [ncurses] ++ optionals useX11 [ x11 ];

     

       32
       32
       +
         buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];

     

       33
       33
        
         installTargets = "install" + optionalString useNativeCompilers " installopt";

     

       34
       34
        
         prePatch = ''

     

       35
       35
        
           CAT=$(type -tp cat)

+3 -3

pkgs/development/compilers/ocaml/3.12.1.nix

···

       1
       1
       -
       { stdenv, fetchurl, ncurses, x11 }:

     

       1
       1
       +
       { stdenv, fetchurl, ncurses, xlibsWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
          useX11 = !stdenv.isArm && !stdenv.isMips;

     
···

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         prefixKey = "-prefix ";

     

       19
       19
       -
         configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];

     

       19
       19
       +
         configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];

     

       20
       20
        
         buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";

     

       21
       21
       -
         buildInputs = [ncurses] ++ optionals useX11 [ x11 ];

     

       21
       21
       +
         buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];

     

       22
       22
        
         installTargets = "install" + optionalString useNativeCompilers " installopt";

     

       23
       23
        
         patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ];

     

       24
       24
        
         preConfigure = ''

+3 -3

pkgs/development/compilers/ocaml/4.00.1.nix

···

       1
       1
       -
       { stdenv, fetchurl, ncurses, x11 }:

     

       1
       1
       +
       { stdenv, fetchurl, ncurses, xlibsWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
          useX11 = !stdenv.isArm && !stdenv.isMips;

     
···

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         prefixKey = "-prefix ";

     

       19
       19
       -
         configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];

     

       19
       19
       +
         configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];

     

       20
       20
        
         buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";

     

       21
       21
       -
         buildInputs = [ncurses] ++ optionals useX11 [ x11 ];

     

       21
       21
       +
         buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];

     

       22
       22
        
         installTargets = "install" + optionalString useNativeCompilers " installopt";

     

       23
       23
        
         preConfigure = ''

     

       24
       24
        
           CAT=$(type -tp cat)

+3 -3

pkgs/development/compilers/ocaml/ber-metaocaml-003.nix

···

       1
       1
       -
       { stdenv, fetchurl, ncurses, x11 }:

     

       1
       1
       +
       { stdenv, fetchurl, ncurses, xlibsWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
          useX11 = stdenv.isi686 || stdenv.isx86_64;

     
···

       26
       26
        
         patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ];

     

       27
       27
        
       

     

       28
       28
        
         prefixKey = "-prefix ";

     

       29
       29
       -
         configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];

     

       29
       29
       +
         configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];

     

       30
       30
        
         buildFlags = "core coreboot all"; # "world" + optionalString useNativeCompilers " bootstrap world.opt";

     

       31
       31
       -
         buildInputs = [ncurses] ++ optionals useX11 [ x11 ];

     

       31
       31
       +
         buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];

     

       32
       32
        
         installFlags = "-i";

     

       33
       33
        
         installTargets = "install"; # + optionalString useNativeCompilers " installopt";

     

       34
       34
        
         prePatch = ''

+3 -3

pkgs/development/compilers/ocaml/metaocaml-3.09.nix

···

       1
       1
       -
       { stdenv, fetchurl, x11, ncurses }:

     

       1
       1
       +
       { stdenv, fetchurl, xlibsWrapper, ncurses }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation (rec {

     

       4
       4
        
       

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         prefixKey = "-prefix ";

     

       13
       13
       -
         configureFlags = ["-no-tk" "-x11lib" x11];

     

       13
       13
       +
         configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];

     

       14
       14
        
         buildFlags = "world bootstrap world.opt";

     

       15
       15
       -
         buildInputs = [x11 ncurses];

     

       15
       15
       +
         buildInputs = [xlibsWrapper ncurses];

     

       16
       16
        
         installTargets = "install installopt";

     

       17
       17
        
         patchPhase = ''

     

       18
       18
        
           CAT=$(type -tp cat)

+2 -2

pkgs/development/haskell-modules/hackage-packages.nix

···

       60530
       60530
        
            }) {};

     

       60531
       60531
        
       

     

       60532
       60532
        
         "gtk-traymanager" = callPackage

     

       60533
       60533
       -
           ({ mkDerivation, base, glib, gtk, x11 }:

     

       60533
       60533
       +
           ({ mkDerivation, base, glib, gtk, xlibsWrapper }:

     

       60534
       60534
        
            mkDerivation {

     

       60535
       60535
        
              pname = "gtk-traymanager";

     

       60536
       60536
        
              version = "0.1.5";

     

       60537
       60537
        
              sha256 = "1582e229aafe22cf5499fe1519e2ff4f49cecbe83a6eb1a8de04f45dd44df443";

     

       60538
       60538
        
              libraryHaskellDepends = [ base glib gtk ];

     

       60539
       60539
       -
              libraryPkgconfigDepends = [ x11 ];

     

       60539
       60539
       +
              libraryPkgconfigDepends = [ xlibsWrapper ];

     

       60540
       60540
        
              homepage = "http://github.com/travitch/gtk-traymanager";

     

       60541
       60541
        
              description = "A wrapper around the eggtraymanager library for Linux system trays";

     

       60542
       60542
        
              license = stdenv.lib.licenses.lgpl21;

+2 -2

pkgs/development/interpreters/pypy/default.nix

···

       1
       1
        
       { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi

     

       2
       2
       -
       , sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11

     

       2
       2
       +
       , sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, xlibsWrapper, libX11

     

       3
       3
        
       , makeWrapper, callPackage, self }:

     

       4
       4
        
       

     

       5
       5
        
       assert zlibSupport -> zlib != null;

     
···

       21
       21
        
             sha256 = "0xympj874cnjpxj68xm5gllq2f8bbvz8hr0md8mh1yd6fgzzxibh";

     

       22
       22
        
           };

     

       23
       23
        
       

     

       24
       24
       -
           buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ]

     

       24
       24
       +
           buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper ]

     

       25
       25
        
             ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc

     

       26
       26
        
             ++ stdenv.lib.optional zlibSupport zlib;

     

       27
       27

+3 -3

pkgs/development/interpreters/python/2.6/default.nix

···

       1
       1
        
       { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false

     

       2
       2
       -
       , sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, self, callPackage }:

     

       2
       2
       +
       , sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage }:

     

       3
       3
        
       

     

       4
       4
        
       assert zlibSupport -> zlib != null;

     

       5
       5
        
       

     
···

       49
       49
        
       

     

       50
       50
        
         buildInputs =

     

       51
       51
        
           optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++

     

       52
       52
       -
           [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ]

     

       52
       52
       +
           [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ]

     

       53
       53
        
           ++ optional zlibSupport zlib;

     

       54
       54
        
       

     

       55
       55
        
       

     
···

       198
       198
        
       

     

       199
       199
        
           tkinter = buildInternalPythonModule {

     

       200
       200
        
             moduleName = "tkinter";

     

       201
       201
       -
             deps = [ tcl tk x11 ];

     

       201
       201
       +
             deps = [ tcl tk xlibsWrapper ];

     

       202
       202
        
           };

     

       203
       203
        
       

     

       204
       204
        
           readline = buildInternalPythonModule {

+4 -4

pkgs/development/interpreters/python/2.7/default.nix

···

       5
       5
        
       

     

       6
       6
        
       , db, gdbm, ncurses, sqlite, readline

     

       7
       7
        
       

     

       8
       8
       -
       , tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? !stdenv.isCygwin

     

       8
       8
       +
       , tcl ? null, tk ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? !stdenv.isCygwin

     

       9
       9
        
       , zlib ? null, zlibSupport ? true

     

       10
       10
        
       , expat, libffi

     

       11
       11
        
       

     
···

       15
       15
        
       assert zlibSupport -> zlib != null;

     

       16
       16
        
       assert x11Support -> tcl != null

     

       17
       17
        
                         && tk != null

     

       18
       18
       -
                         && x11 != null

     

       18
       18
       +
                         && xlibsWrapper != null

     

       19
       19
        
                         && libX11 != null;

     

       20
       20
        
       

     

       21
       21
        
       with stdenv.lib;

     
···

       92
       92
        
           ++ optionals stdenv.isCygwin [ expat libffi ]

     

       93
       93
        
           ++ optionals includeModules (

     

       94
       94
        
               [ db gdbm ncurses sqlite readline

     

       95
       95
       -
               ] ++ optionals x11Support [ tcl tk x11 libX11 ]

     

       95
       95
       +
               ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ]

     

       96
       96
        
           )

     

       97
       97
        
           ++ optional zlibSupport zlib

     

       98
       98
        
       

     
···

       249
       249
        
       

     

       250
       250
        
           tkinter = if stdenv.isCygwin then null else (buildInternalPythonModule {

     

       251
       251
        
             moduleName = "tkinter";

     

       252
       252
       -
             deps = [ tcl tk x11 libX11 ];

     

       252
       252
       +
             deps = [ tcl tk xlibsWrapper libX11 ];

     

       253
       253
        
           });

     

       254
       254
        
       

     

       255
       255
        
         } // {

+3 -3

pkgs/development/libraries/SDL/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, audiofile, libcap

     

       2
       2
        
       , openglSupport ? false, mesa ? null

     

       3
       3
        
       , alsaSupport ? true, alsaLib ? null

     

       4
       4
       -
       , x11Support ? true, x11 ? null, libXrandr ? null

     

       4
       4
       +
       , x11Support ? true, xlibsWrapper ? null, libXrandr ? null

     

       5
       5
        
       , pulseaudioSupport ? true, libpulseaudio ? null

     

       6
       6
        
       }:

     

       7
       7
        
       

     
···

       10
       10
        
       assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport;

     

       11
       11
        
       

     

       12
       12
        
       assert openglSupport -> (mesa != null && x11Support);

     

       13
       13
       -
       assert x11Support -> (x11 != null && libXrandr != null);

     

       13
       13
       +
       assert x11Support -> (xlibsWrapper != null && libXrandr != null);

     

       14
       14
        
       assert alsaSupport -> alsaLib != null;

     

       15
       15
        
       assert pulseaudioSupport -> libpulseaudio != null;

     

       16
       16
        
       

     
···

       32
       32
        
       

     

       33
       33
        
         # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.

     

       34
       34
        
         propagatedBuildInputs =

     

       35
       35
       -
           optionals x11Support [ x11 libXrandr ] ++

     

       35
       35
       +
           optionals x11Support [ xlibsWrapper libXrandr ] ++

     

       36
       36
        
           optional alsaSupport alsaLib ++

     

       37
       37
        
           optional stdenv.isLinux libcap ++

     

       38
       38
        
           optional openglSupport mesa ++

+3 -3

pkgs/development/libraries/SDL2/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, audiofile

     

       2
       2
        
       , openglSupport ? false, mesa ? null

     

       3
       3
        
       , alsaSupport ? true, alsaLib ? null

     

       4
       4
       -
       , x11Support ? true, x11 ? null, libXrandr ? null

     

       4
       4
       +
       , x11Support ? true, xlibsWrapper ? null, libXrandr ? null

     

       5
       5
        
       , pulseaudioSupport ? true, libpulseaudio ? null

     

       6
       6
        
       }:

     

       7
       7
        
       

     
···

       10
       10
        
       assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;

     

       11
       11
        
       

     

       12
       12
        
       assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support);

     

       13
       13
       -
       assert x11Support -> (x11 != null && libXrandr != null);

     

       13
       13
       +
       assert x11Support -> (xlibsWrapper != null && libXrandr != null);

     

       14
       14
        
       assert alsaSupport -> alsaLib != null;

     

       15
       15
        
       assert pulseaudioSupport -> libpulseaudio != null;

     

       16
       16
        
       

     
···

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.

     

       34
       34
       -
         propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++

     

       34
       34
       +
         propagatedBuildInputs = stdenv.lib.optionals x11Support [ xlibsWrapper libXrandr ] ++

     

       35
       35
        
           stdenv.lib.optional pulseaudioSupport libpulseaudio;

     

       36
       36
        
       

     

       37
       37
        
         buildInputs = [ pkgconfig audiofile ] ++

+3 -3

pkgs/development/libraries/Xaw3d/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, x11, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}:

     

       1
       1
       +
       {stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "Xaw3d-1.5E";

     
···

       8
       8
        
           md5 = "29ecfdcd6bcf47f62ecfd672d31269a1";

     

       9
       9
        
         };

     

       10
       10
        
         patches = [./config.patch ./laylex.patch];

     

       11
       11
       -
         buildInputs = [x11 imake gccmakedep libXmu libXpm libXp bison flex];

     

       12
       12
       -
         propagatedBuildInputs = [x11 libXmu];

     

       11
       11
       +
         buildInputs = [imake gccmakedep libXpm libXp bison flex];

     

       12
       12
       +
         propagatedBuildInputs = [xlibsWrapper libXmu];

     

       13
       13
        
       

     

       14
       14
        
         meta = {

     

       15
       15
        
           description = "3D widget set based on the Athena Widget set";

+2 -2

pkgs/development/libraries/cairomm/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, pkgconfig, cairo, x11, fontconfig, freetype, libsigcxx }:

     

       1
       1
       +
       { fetchurl, stdenv, pkgconfig, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "cairomm-1.11.2";

     
···

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ pkgconfig ];

     

       12
       12
        
       

     

       13
       13
       -
         propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ];

     

       13
       13
       +
         propagatedBuildInputs = [ cairo xlibsWrapper fontconfig freetype libsigcxx ];

     

       14
       14
        
       

     

       15
       15
        
         meta = with stdenv.lib; {

     

       16
       16
        
           description = "A 2D graphics library with support for multiple output devices";

+3 -3

pkgs/development/libraries/dlib/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, cmake, x11 }:

     

       1
       1
       +
       { stdenv, fetchurl, cmake, xlibsWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "18.10";

     
···

       31
       31
        
         '';   

     

       32
       32
        
       

     

       33
       33
        
         enableParallelBuilding = true;

     

       34
       34
       -
         buildInputs = [ cmake x11 ];

     

       35
       35
       -
         propagatedBuildInputs = [ x11 ];

     

       34
       34
       +
         buildInputs = [ cmake xlibsWrapper ];

     

       35
       35
       +
         propagatedBuildInputs = [ xlibsWrapper ];

     

       36
       36
        
       

     

       37
       37
        
         meta = with stdenv.lib; {

     

       38
       38
        
           description = "A general purpose cross-platform C++ machine learning library";

+2 -2

pkgs/development/libraries/fltk/default.nix

···

       1
       1
       -
       { composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi

     

       1
       1
       +
       { composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi

     

       2
       2
        
       , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }:

     

       3
       3
        
       

     

       4
       4
        
       let inherit (composableDerivation) edf; in

     
···

       11
       11
        
           sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         propagatedBuildInputs = [ x11 inputproto libXi freeglut ];

     

       14
       14
       +
         propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ];

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = [ pkgconfig ];

     

       17
       17

+2 -2

pkgs/development/libraries/fltk/fltk13.nix

···

       1
       1
       -
       { composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi

     

       1
       1
       +
       { composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi

     

       2
       2
        
       , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng

     

       3
       3
        
       , cfg ? {}

     

       4
       4
        
       , automake, autoconf, libtool

     
···

       21
       21
        
             --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand'

     

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
       -
         propagatedBuildInputs = [ x11 inputproto libXi freeglut ];

     

       24
       24
       +
         propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ];

     

       25
       25
        
       

     

       26
       26
        
         enableParallelBilding = true;

     

       27
       27

+2 -2

pkgs/development/libraries/fox/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }:

     

       1
       1
       +
       { stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         version = "1.7.9";

     
···

       12
       12
        
           sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ];

     

       15
       15
       +
         buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ];

     

       16
       16
        
       

     

       17
       17
        
         doCheck = true;

     

       18
       18

+2 -2

pkgs/development/libraries/fox/fox-1.6.nix

···

       1
       1
       -
       { stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor

     

       1
       1
       +
       { stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor

     

       2
       2
        
       , libXrandr, mesa, libXft, libXfixes, xinput }:

     

       3
       3
        
       

     

       4
       4
        
       let

     
···

       13
       13
        
           sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr

     

       16
       16
       +
         buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr

     

       17
       17
        
             libXft mesa libXfixes xinput ];

     

       18
       18
        
       

     

       19
       19
        
         doCheck = true;

+2 -2

pkgs/development/libraries/freeglut/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11, cmake }:

     

       1
       1
       +
       { stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, xlibsWrapper, cmake }:

     

       2
       2
        
       

     

       3
       3
        
       let version = "3.0.0";

     

       4
       4
        
       in stdenv.mkDerivation {

     
···

       9
       9
        
           sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ libXi libXrandr libXxf86vm mesa x11 cmake ];

     

       12
       12
       +
         buildInputs = [ libXi libXrandr libXxf86vm mesa xlibsWrapper cmake ];

     

       13
       13
        
       

     

       14
       14
        
         meta = with stdenv.lib; {

     

       15
       15
        
           description = "Create and manage windows containing OpenGL contexts";

+2 -2

pkgs/development/libraries/giblib/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, x11, imlib2 }:

     

       1
       1
       +
       { stdenv, fetchurl, xlibsWrapper, imlib2 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "giblib-1.2.4";

     
···

       8
       8
        
           sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp";

     

       9
       9
        
         };

     

       10
       10
        
         

     

       11
       11
       -
         buildInputs = [x11 imlib2];

     

       11
       11
       +
         buildInputs = [xlibsWrapper imlib2];

     

       12
       12
        
       

     

       13
       13
        
         meta = {

     

       14
       14
        
           homepage = http://linuxbrit.co.uk/giblib/;

+2 -2

pkgs/development/libraries/glew/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }:

     

       1
       1
       +
       { stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi }:

     

       2
       2
        
       

     

       3
       3
        
       with stdenv.lib;

     

       4
       4
        
       

     
···

       10
       10
        
           sha256 = "1mhkllxz49l1x680dmzrv2i82qjrq017sykah3xc90f2d8qcxfv9";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         nativeBuildInputs = [ x11 libXmu libXi ];

     

       13
       13
       +
         nativeBuildInputs = [ xlibsWrapper libXmu libXi ];

     

       14
       14
        
         propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h

     

       15
       15
        
       

     

       16
       16
        
         patchPhase = ''

+2 -2

pkgs/development/libraries/glfw/3.x.nix

···

       1
       1
       -
       { stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11

     

       1
       1
       +
       { stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper

     

       2
       2
        
       , libXinerama, libXcursor

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       13
       13
        
         enableParallelBuilding = true;

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [

     

       16
       16
       -
           cmake mesa libXrandr libXi libXxf86vm libXfixes x11

     

       16
       16
       +
           cmake mesa libXrandr libXi libXxf86vm libXfixes xlibsWrapper

     

       17
       17
        
           libXinerama libXcursor

     

       18
       18
        
         ];

     

       19
       19

+2 -2

pkgs/development/libraries/gtk+/2.x.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs

     

       2
       2
       -
       , gdk_pixbuf, libintlOrEmpty, x11

     

       2
       2
       +
       , gdk_pixbuf, libintlOrEmpty, xlibsWrapper

     

       3
       3
        
       , xineramaSupport ? stdenv.isLinux

     

       4
       4
        
       , cupsSupport ? true, cups ? null

     

       5
       5
        
       }:

     
···

       26
       26
        
           ++ optionals (stdenv.isLinux || stdenv.isDarwin) [

     

       27
       27
        
                libXrandr libXrender libXcomposite libXi libXcursor

     

       28
       28
        
              ]

     

       29
       29
       -
           ++ optionals stdenv.isDarwin [ x11 libXdamage ]

     

       29
       29
       +
           ++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ]

     

       30
       30
        
           ++ libintlOrEmpty

     

       31
       31
        
           ++ optional xineramaSupport libXinerama

     

       32
       32
        
           ++ optionals cupsSupport [ cups ];

+1 -1

pkgs/development/libraries/gtk+/3.x.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gettext, perl

     

       2
       2
        
       , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection

     

       3
       3
       -
       , xlibs, x11, wayland, libxkbcommon, epoxy

     

       3
       3
       +
       , xlibs, xlibsWrapper, wayland, libxkbcommon, epoxy

     

       4
       4
        
       , xineramaSupport ? stdenv.isLinux

     

       5
       5
        
       , cupsSupport ? stdenv.isLinux, cups ? null

     

       6
       6
        
       }:

+2 -2

pkgs/development/libraries/imlib2/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, x11, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }:

     

       1
       1
       +
       { stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "imlib2-1.4.6";

     
···

       8
       8
        
           sha256 = "0x1j0ylpclkp8cfpwfpkjywqz124bqskyxbw8pvwzkv2gmrbwldg";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ x11 libjpeg libtiff giflib libpng bzip2 ];

     

       11
       11
       +
         buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ];

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig ];

     

       14
       14

+2 -2

pkgs/development/libraries/lirc/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, x11, python3, libxslt }:

     

       1
       1
       +
       { stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3, libxslt }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "lirc-0.9.3";

     
···

       10
       10
        
       

     

       11
       11
        
         preBuild = "patchShebangs .";

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ alsaLib help2man pkgconfig x11 python3 libxslt ];

     

       13
       13
       +
         buildInputs = [ alsaLib help2man pkgconfig xlibsWrapper python3 libxslt ];

     

       14
       14
        
       

     

       15
       15
        
         configureFlags = [

     

       16
       16
        
           "--with-driver=devinput"

+2 -2

pkgs/development/libraries/pango/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, xlibsWrapper, glib, cairo, libpng, harfbuzz

     

       2
       2
        
       , fontconfig, freetype, libintlOrEmpty, gobjectIntrospection

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       18
       18
        
           ++ optionals stdenv.isDarwin [ fontconfig ];

     

       19
       19
        
         nativeBuildInputs = [ pkgconfig ];

     

       20
       20
        
       

     

       21
       21
       -
         propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty;

     

       21
       21
       +
         propagatedBuildInputs = [ xlibsWrapper glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty;

     

       22
       22
        
       

     

       23
       23
        
         enableParallelBuilding = true;

     

       24
       24

+4 -4

pkgs/development/libraries/physics/geant4/default.nix

···

       26
       26
        
       

     

       27
       27
        
       # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.

     

       28
       28
        
       , mesa   ? null

     

       29
       29
       -
       , x11    ? null

     

       29
       29
       +
       , xlibsWrapper    ? null

     

       30
       30
        
       , libXmu ? null

     

       31
       31
        
       }:

     

       32
       32
        
       

     
···

       41
       41
        
       

     

       42
       42
        
       # OpenGL/X11 User Interface and Visualisation drivers.

     

       43
       43
        
       assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> mesa   != null;

     

       44
       44
       -
       assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> x11    != null;

     

       44
       44
       +
       assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper    != null;

     

       45
       45
        
       assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null;

     

       46
       46
        
       

     

       47
       47
        
       let

     
···

       81
       81
        
             };

     

       82
       82
        
       

     

       83
       83
        
             enableParallelBuilding = true;

     

       84
       84
       -
             buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa x11 libXmu ];

     

       85
       85
       -
             propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa x11 libXmu ];

     

       84
       84
       +
             buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ];

     

       85
       85
       +
             propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ];

     

       86
       86
        
       

     

       87
       87
        
             setupHook = ./setup-hook.sh;

     

       88
       88

+2 -2

pkgs/development/libraries/qt-3/default.nix

···

       7
       7
        
       , threadSupport ? true

     

       8
       8
        
       , mysqlSupport ? false, mysql ? null

     

       9
       9
        
       , openglSupport ? false, mesa ? null, libXmu ? null

     

       10
       10
       -
       , x11, xextproto, zlib, libjpeg, libpng, which

     

       10
       10
       +
       , xlibsWrapper, xextproto, zlib, libjpeg, libpng, which

     

       11
       11
        
       }:

     

       12
       12
        
       

     

       13
       13
        
       assert xftSupport -> libXft != null;

     
···

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [ which ];

     

       33
       33
       -
         propagatedBuildInputs = [libpng x11 libXft libXrender zlib libjpeg];

     

       33
       33
       +
         propagatedBuildInputs = [libpng xlibsWrapper libXft libXrender zlib libjpeg];

     

       34
       34
        
       

     

       35
       35
        
         configureFlags = "

     

       36
       36
        
           -v

+2 -2

pkgs/development/libraries/snack/default.nix

···

       1
       1
        
       # alsaLib vorbisTools python can be made optional

     

       2
       2
        
       

     

       3
       3
       -
       { stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, x11 }:

     

       3
       3
       +
       { stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, xlibsWrapper }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation {

     

       6
       6
        
         name = "snack-2.2.10";

     
···

       14
       14
        
       

     

       15
       15
        
         postUnpack = ''sourceRoot="$sourceRoot/unix"'';

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ python tcl tk vorbisTools pkgconfig x11 ];

     

       17
       17
       +
         buildInputs = [ python tcl tk vorbisTools pkgconfig xlibsWrapper ];

     

       18
       18
        
       

     

       19
       19
        
         postInstall = "aoeu";

     

       20
       20

+2 -2

pkgs/development/pure-modules/gl/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, x11 }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, xlibsWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         baseName = "gl";

     
···

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = [ pkgconfig ];

     

       14
       14
       -
         propagatedBuildInputs = [ pure freeglut mesa x11 ];

     

       14
       14
       +
         propagatedBuildInputs = [ pure freeglut mesa xlibsWrapper ];

     

       15
       15
        
         makeFlags = "libdir=$(out)/lib prefix=$(out)/";

     

       16
       16
        
         setupHook = ../generic-setup-hook.sh;

     

       17
       17

+2 -2

pkgs/development/pure-modules/tk/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, pure, tcl, tk, x11 }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, pure, tcl, tk, xlibsWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         baseName = "tk";

     
···

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = [ pkgconfig ];

     

       14
       14
       -
         propagatedBuildInputs = [ pure tcl tk x11 ];

     

       14
       14
       +
         propagatedBuildInputs = [ pure tcl tk xlibsWrapper ];

     

       15
       15
        
         makeFlags = "libdir=$(out)/lib prefix=$(out)/";

     

       16
       16
        
         setupHook = ../generic-setup-hook.sh;

     

       17
       17

+2 -2

pkgs/development/python-modules/pycairo/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, x11, isPyPy }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, xlibsWrapper, isPyPy }:

     

       2
       2
        
       

     

       3
       3
        
       if isPyPy then throw "pycairo not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {

     

       4
       4
        
         version = "1.10.0";

     
···

       23
       23
        
           sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
       -
         buildInputs = [ python pkgconfig cairo x11 ];

     

       26
       26
       +
         buildInputs = [ python pkgconfig cairo xlibsWrapper ];

     

       27
       27
        
       

     

       28
       28
        
         configurePhase = ''

     

       29
       29
        
           (

+1 -1

pkgs/development/r-modules/default.nix

···

       289
       289
        
           rgdal = [ pkgs.proj pkgs.gdal ];

     

       290
       290
        
           rgeos = [ pkgs.geos ];

     

       291
       291
        
           rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ];

     

       292
       292
       -
           rgl = [ pkgs.mesa pkgs.x11 ];

     

       292
       292
       +
           rgl = [ pkgs.mesa pkgs.xlibsWrapper ];

     

       293
       293
        
           Rglpk = [ pkgs.glpk ];

     

       294
       294
        
           RGtk2 = [ pkgs.gtk2 ];

     

       295
       295
        
           Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ];

+2 -2

pkgs/games/astromenace/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, cmake, x11, mesa, SDL, openal, freealut, libogg, libvorbis }:

     

       1
       1
       +
       { fetchurl, stdenv, cmake, xlibsWrapper, mesa, SDL, openal, freealut, libogg, libvorbis }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "1.3.2";

     
···

       9
       9
        
           sha256 = "1rkz6lwjcd5mwv72kf07ghvx6z46kf3xs250mjbmnmjpn7r5sxwv";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ cmake x11 mesa SDL openal freealut libogg libvorbis ];

     

       12
       12
       +
         buildInputs = [ cmake xlibsWrapper mesa SDL openal freealut libogg libvorbis ];

     

       13
       13
        
       

     

       14
       14
        
         buildPhase = ''

     

       15
       15
        
           cmake ./

+2 -2

pkgs/games/minetest/default.nix

···

       1
       1
        
       { stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp

     

       2
       2
       -
       , libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite, luajit, freetype

     

       2
       2
       +
       , libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, sqlite, luajit, freetype

     

       3
       3
        
       , gettext

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       31
       31
        
       

     

       32
       32
        
         buildInputs = [

     

       33
       33
        
           cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa

     

       34
       34
       -
           openal libvorbis x11 sqlite luajit freetype gettext

     

       34
       34
       +
           openal libvorbis xlibsWrapper sqlite luajit freetype gettext

     

       35
       35
        
         ];

     

       36
       36
        
       

     

       37
       37
        
         postInstall = ''

+2 -2

pkgs/games/quake3/game/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, x11, SDL, mesa, openal, gcc46 }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, xlibsWrapper, SDL, mesa, openal, gcc46 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "ioquake3-1.36";

     
···

       25
       25
        
           ./botlib.patch

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
       -
         buildInputs = [ x11 SDL mesa openal gcc46 ];

     

       28
       28
       +
         buildInputs = [ xlibsWrapper SDL mesa openal gcc46 ];

     

       29
       29
        
       

     

       30
       30
        
         # Fix building on GCC 4.6.

     

       31
       31
        
         NIX_CFLAGS_COMPILE = "-Wno-error";

+2 -2

pkgs/games/voxelands/default.nix

···

       1
       1
        
       { stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite

     

       2
       2
       -
       , libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, pkgconfig }:

     

       2
       2
       +
       , libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, pkgconfig }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "voxelands-${version}";

     
···

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
        
           cmake irrlicht libpng bzip2 libjpeg sqlite

     

       21
       21
       -
           libXxf86vm mesa openal libvorbis x11 pkgconfig

     

       21
       21
       +
           libXxf86vm mesa openal libvorbis xlibsWrapper pkgconfig

     

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
        
         meta = with stdenv.lib; {

+2 -2

pkgs/games/zoom/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, perl, expat, x11, freetype }:

     

       1
       1
       +
       { stdenv, fetchurl, perl, expat, xlibsWrapper, freetype }:

     

       2
       2
        
       

     

       3
       3
        
       # !!! assert freetype == xlibs.freetype

     

       4
       4
        
       

     
···

       10
       10
        
           sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj";

     

       11
       11
        
         };

     

       12
       12
        
         

     

       13
       13
       -
         buildInputs = [ perl expat x11 freetype ];

     

       13
       13
       +
         buildInputs = [ perl expat xlibsWrapper freetype ];

     

       14
       14
        
         

     

       15
       15
        
         # Zoom doesn't add the right directory in the include path.

     

       16
       16
        
         CFLAGS = [ "-I" (freetype + "/include/freetype2") ];

+2 -2

pkgs/misc/emulators/snes9x-gtk/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, x11, libpulseaudio}:

     

       1
       1
       +
       {stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, xlibsWrapper, libpulseaudio}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "snes9x-gtk-${version}";

     
···

       9
       9
        
           sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 x11 libpulseaudio];

     

       12
       12
       +
         buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 xlibsWrapper libpulseaudio];

     

       13
       13
        
       

     

       14
       14
        
         sourceRoot = "snes9x-${version}-src/gtk";

     

       15
       15

+3 -3

pkgs/misc/ghostscript/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, zlib, expat, openssl

     

       2
       2
        
       , libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec

     

       3
       3
        
       , libiconv

     

       4
       4
       -
       , x11Support ? false, x11 ? null

     

       4
       4
       +
       , x11Support ? false, xlibsWrapper ? null

     

       5
       5
        
       , cupsSupport ? false, cups ? null

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
       -
       assert x11Support -> x11 != null;

     

       8
       8
       +
       assert x11Support -> xlibsWrapper != null;

     

       9
       9
        
       assert cupsSupport -> cups != null;

     

       10
       10
        
       let

     

       11
       11
        
         version = "9.15";

     
···

       50
       50
        
             libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec

     

       51
       51
        
             libiconv

     

       52
       52
        
           ]

     

       53
       53
       -
           ++ stdenv.lib.optional x11Support x11

     

       53
       53
       +
           ++ stdenv.lib.optional x11Support xlibsWrapper

     

       54
       54
        
           ++ stdenv.lib.optional cupsSupport cups

     

       55
       55
        
           # [] # maybe sometimes jpeg2000 support

     

       56
       56
        
           ;

+2 -2

pkgs/misc/screensavers/rss-glx/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, pkgconfig, x11, libXext, mesa, imagemagick, libtiff, bzip2}:

     

       1
       1
       +
       {stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, mesa, imagemagick, libtiff, bzip2}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "0.9.1";

     
···

       9
       9
        
           sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ pkgconfig mesa x11 imagemagick libtiff bzip2 ];

     

       12
       12
       +
         buildInputs = [ pkgconfig mesa xlibsWrapper imagemagick libtiff bzip2 ];

     

       13
       13
        
       

     

       14
       14
        
         NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick";

     

       15
       15
        
         NIX_LDFLAGS= "-rpath ${libXext}/lib";

+2 -2

pkgs/misc/screensavers/xautolock/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, x11, imake, libXScrnSaver, scrnsaverproto}:

     

       1
       1
       +
       {stdenv, fetchurl, xlibsWrapper, imake, libXScrnSaver, scrnsaverproto}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec

     

       4
       4
        
       {

     
···

       11
       11
        
         makeFlags="BINDIR=\${out}/bin MANPATH=\${out}/man";

     

       12
       12
        
         preBuild = "xmkmf";

     

       13
       13
        
         installTargets = "install install.man";

     

       14
       14
       -
         buildInputs = [x11 imake libXScrnSaver scrnsaverproto];

     

       14
       14
       +
         buildInputs = [xlibsWrapper imake libXScrnSaver scrnsaverproto];

     

       15
       15
        
       }

+2 -2

pkgs/misc/screensavers/xtrlock-pam/default.nix

···

       1
       1
       -
       { stdenv, fetchgit, python, pkgconfig, x11, pam }:

     

       1
       1
       +
       { stdenv, fetchgit, python, pkgconfig, xlibsWrapper, pam }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "xtrlock-pam-3.4-post-20150909";

     
···

       9
       9
        
           sha256 = "fa8aeedfa2a4e1d813f8cad562bafdd4e2c5130df0a7cde7b2f956a32044e9f8";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ python pkgconfig x11 pam ];

     

       12
       12
       +
         buildInputs = [ python pkgconfig xlibsWrapper pam ];

     

       13
       13
        
       

     

       14
       14
        
         configurePhase = ''

     

       15
       15
        
           substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h

+3 -3

pkgs/os-specific/linux/conky/default.nix

···

       9
       9
        
       

     

       10
       10
        
       # optional features with extra dependencies

     

       11
       11
        
       , ncursesSupport      ? true      , ncurses       ? null

     

       12
       12
       -
       , x11Support          ? true      , x11           ? null

     

       12
       12
       +
       , x11Support          ? true      , xlibsWrapper           ? null

     

       13
       13
        
       , xdamageSupport      ? x11Support, libXdamage    ? null

     

       14
       14
        
       , imlib2Support       ? x11Support, imlib2        ? null

     

       15
       15
        
       

     
···

       29
       29
        
       

     

       30
       30
        
       assert ncursesSupport      -> ncurses != null;

     

       31
       31
        
       

     

       32
       32
       -
       assert x11Support          -> x11 != null;

     

       32
       32
       +
       assert x11Support          -> xlibsWrapper != null;

     

       33
       33
        
       assert xdamageSupport      -> x11Support && libXdamage != null;

     

       34
       34
        
       assert imlib2Support       -> x11Support && imlib2     != null;

     

       35
       35
        
       assert luaSupport          -> lua != null;

     
···

       64
       64
        
       

     

       65
       65
        
         buildInputs = [ pkgconfig glib cmake ]

     

       66
       66
        
           ++ optional  ncursesSupport     ncurses

     

       67
       67
       -
           ++ optional  x11Support         x11

     

       67
       67
       +
           ++ optional  x11Support         xlibsWrapper

     

       68
       68
        
           ++ optional  xdamageSupport     libXdamage

     

       69
       69
        
           ++ optional  imlib2Support      imlib2

     

       70
       70
        
           ++ optional  luaSupport         lua

+2 -2

pkgs/tools/X11/primus/lib.nix

···

       1
       1
        
       { stdenv, fetchgit

     

       2
       2
       -
       , x11, mesa

     

       2
       2
       +
       , xlibsWrapper, mesa

     

       3
       3
        
       , nvidia

     

       4
       4
        
       }:

     

       5
       5
        
       let

     
···

       15
       15
        
       

     

       16
       16
        
         inherit nvidia mesa;

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ x11 mesa ];

     

       18
       18
       +
         buildInputs = [ xlibsWrapper mesa ];

     

       19
       19
        
         builder = ./builder.sh;

     

       20
       20
        
       }

+2 -2

pkgs/tools/X11/xinput_calibrator/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, x11, pkgconfig }:

     

       1
       1
       +
       { stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "0.7.5";

     
···

       10
       10
        
       

     

       11
       11
        
         preConfigure = "./autogen.sh --with-gui=X11";

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ inputproto libXi autoconf automake libtool m4 x11 pkgconfig ];

     

       13
       13
       +
         buildInputs = [ inputproto libXi autoconf automake libtool m4 xlibsWrapper pkgconfig ];

     

       14
       14
        
       

     

       15
       15
        
         meta = {

     

       16
       16
        
           homepage = https://github.com/tias/xinput_calibrator;

+2 -2

pkgs/tools/admin/tightvnc/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu

     

       1
       1
       +
       { stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu

     

       2
       2
        
       , libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     
···

       13
       13
        
         inherit xauth fontDirectories perl;

     

       14
       14
        
         gcc = stdenv.cc.cc;

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ x11 zlib libjpeg imake gccmakedep libXmu libXaw

     

       16
       16
       +
         buildInputs = [ xlibsWrapper zlib libjpeg imake gccmakedep libXmu libXaw

     

       17
       17
        
                         libXpm libXp xauth openssh ];

     

       18
       18
        
       

     

       19
       19
        
         patchPhase = ''

+2 -2

pkgs/tools/audio/pasystray/default.nix

···

       1
       1
        
       {stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig

     

       2
       2
       -
       , gnome3, avahi, gtk3, libnotify, libpulseaudio, x11}:

     

       2
       2
       +
       , gnome3, avahi, gtk3, libnotify, libpulseaudio, xlibsWrapper}:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "pasystray-0.5.2";

     
···

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ autoconf automake makeWrapper pkgconfig 

     

       15
       15
        
                         gnome3.defaultIconTheme

     

       16
       16
       -
                         avahi gtk3 libnotify libpulseaudio x11 ];

     

       16
       16
       +
                         avahi gtk3 libnotify libpulseaudio xlibsWrapper ];

     

       17
       17
        
       

     

       18
       18
        
         preConfigure = ''

     

       19
       19
        
           aclocal

+2 -2

pkgs/tools/graphics/glxinfo/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, x11, mesa}:

     

       1
       1
       +
       {stdenv, fetchurl, xlibsWrapper, mesa}:

     

       2
       2
        
       

     

       3
       3
        
       let version = "8.1.0"; in

     

       4
       4
        
       

     
···

       10
       10
        
           sha256 = "0a58hw5850731p4smz4zqsbvyxvgjf7n5xdbs9l1wamk8q3gl0wp";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [x11 mesa];

     

       13
       13
       +
         buildInputs = [xlibsWrapper mesa];

     

       14
       14
        
       

     

       15
       15
        
         configurePhase = "true";

     

       16
       16

+3 -3

pkgs/tools/graphics/graphviz/2.0.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw

     

       2
       2
        
       , yacc, libtool, fontconfig, pango, gd

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       12
       12
        
           sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd];

     

       15
       15
       +
         buildInputs = [pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd];

     

       16
       16
        
         

     

       17
       17
        
         configureFlags =

     

       18
       18
        
           [ "--with-pngincludedir=${libpng}/include"

     
···

       22
       22
        
             "--with-expatincludedir=${expat}/include"

     

       23
       23
        
             "--with-expatlibdir=${expat}/lib"

     

       24
       24
        
           ]

     

       25
       25
       -
           ++ stdenv.lib.optional (x11 == null) "--without-x";

     

       25
       25
       +
           ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x";

     

       26
       26
        
       

     

       27
       27
        
         meta = {

     

       28
       28
        
           description = "A program for visualising graphs";

+2 -2

pkgs/tools/graphics/scrot/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, giblib, x11 }:

     

       1
       1
       +
       { stdenv, fetchurl, giblib, xlibsWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "scrot-0.8";

     
···

       8
       8
        
           sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ giblib x11 ];

     

       11
       11
       +
         buildInputs = [ giblib xlibsWrapper ];

     

       12
       12
        
       

     

       13
       13
        
         meta = {

     

       14
       14
        
           homepage = http://linuxbrit.co.uk/scrot/;

+2 -2

pkgs/tools/misc/unclutter/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, x11}:

     

       1
       1
       +
       {stdenv, fetchurl, xlibsWrapper}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "unclutter-8";

     
···

       7
       7
        
           sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6";

     

       8
       8
        
         };

     

       9
       9
        
       

     

       10
       10
       -
         buildInputs = [x11];

     

       10
       10
       +
         buildInputs = [xlibsWrapper];

     

       11
       11
        
       

     

       12
       12
        
         installPhase = ''

     

       13
       13
        
           mkdir -pv "$out/bin"

+2 -2

pkgs/tools/misc/xclip/default.nix

···

       1
       1
       -
       { stdenv, fetchsvn, x11, libXmu, autoconf, automake, libtool }:

     

       1
       1
       +
       { stdenv, fetchsvn, xlibsWrapper, libXmu, autoconf, automake, libtool }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         # The last release from 2012, 0.12, lacks '-targets'

     
···

       11
       11
        
       

     

       12
       12
        
         preConfigure = "autoreconf -vfi";

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ x11 libXmu autoconf automake libtool ];

     

       14
       14
       +
         buildInputs = [ xlibsWrapper libXmu autoconf automake libtool ];

     

       15
       15
        
       

     

       16
       16
        
         meta = { 

     

       17
       17
        
           description = "Tool to access the X clipboard from a console application";

+2 -2

pkgs/tools/misc/xsel/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, x11}:

     

       1
       1
       +
       {stdenv, fetchurl, xlibsWrapper}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "xsel-1.2.0";

     
···

       7
       7
        
           sha256 = "070lbcpw77j143jrbkh0y1v10ppn1jwmjf92800w7x42vh4cw9xr";

     

       8
       8
        
         };

     

       9
       9
        
       

     

       10
       10
       -
         buildInputs = [x11];

     

       10
       10
       +
         buildInputs = [xlibsWrapper];

     

       11
       11
        
       }

+2 -2

pkgs/tools/networking/x11-ssh-askpass/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, x11, imake}:

     

       1
       1
       +
       {stdenv, fetchurl, xlibsWrapper, imake}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "x11-ssh-askpass-1.2.4.1";

     
···

       14
       14
        
       

     

       15
       15
        
         buildPhase = "xmkmf; make includes; make";

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [x11 imake];

     

       17
       17
       +
         buildInputs = [xlibsWrapper imake];

     

       18
       18
        
       

     

       19
       19
        
         meta = {

     

       20
       20
        
           homepage = "http://www.jmknoble.net/software/x11-ssh-askpass/";

+2 -2

pkgs/top-level/perl-packages.nix

···

       12163
       12163
        
             url = "mirror://cpan/authors/id/S/SM/SMCCAM/${name}.tar.gz";

     

       12164
       12164
        
             sha256 = "1dq89bh6fqv7l5mbffqcismcljpq5f869bx7g8lg698zgindv5ny";

     

       12165
       12165
        
           };

     

       12166
       12166
       -
           buildInputs = [pkgs.x11];

     

       12166
       12166
       +
           buildInputs = [pkgs.xlibsWrapper];

     

       12167
       12167
        
           NIX_CFLAGS_LINK = "-lX11";

     

       12168
       12168
        
           doCheck = false; # requires an X server

     

       12169
       12169
        
         };

     
···

       12174
       12174
        
             url = "mirror://cpan/authors/id/C/CT/CTRONDLP/${name}.tar.gz";

     

       12175
       12175
        
             sha256 = "0jznws68skdzkhgkgcgjlj40qdyh9i75r7fw8bqzy406f19xxvnw";

     

       12176
       12176
        
           };

     

       12177
       12177
       -
           buildInputs = [pkgs.x11 pkgs.xorg.libXtst pkgs.xorg.libXi];

     

       12177
       12177
       +
           buildInputs = [pkgs.xlibsWrapper pkgs.xorg.libXtst pkgs.xorg.libXi];

     

       12178
       12178
        
           NIX_CFLAGS_LINK = "-lX11 -lXext -lXtst";

     

       12179
       12179
        
           doCheck = false; # requires an X server

     

       12180
       12180
        
         };