diff options
Diffstat (limited to 'pkgs/development')
36 files changed, 85 insertions, 85 deletions
diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix index f4640b36e67..a2581f29a3f 100644 --- a/pkgs/development/compilers/ocaml/3.08.0.nix +++ b/pkgs/development/compilers/ocaml/3.08.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11 }: +{ stdenv, fetchurl, xlibsWrapper }: stdenv.mkDerivation { name = "ocaml-3.08.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; configureScript = ./configure-3.08.0; dontAddPrefix = "True"; - configureFlags = ["-no-tk" "-x11lib" x11]; + configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; buildFlags = ["world" "bootstrap" "opt"]; checkTarget = ["opt.opt"]; } diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 69a6a1f5f67..2734bc3235d 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, ncurses }: +{ stdenv, fetchurl, xlibsWrapper, ncurses }: stdenv.mkDerivation (rec { @@ -10,9 +10,9 @@ stdenv.mkDerivation (rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk" "-x11lib" x11]; + configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; buildFlags = "world bootstrap world.opt"; - buildInputs = [x11 ncurses]; + buildInputs = [xlibsWrapper ncurses]; installTargets = "install installopt"; patchPhase = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index ce61e562139..c62a8151ef7 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = stdenv.isi686 || stdenv.isx86_64; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { ]; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; prePatch = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index e6ed6f4b73e..e9073a42cf0 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = !stdenv.isArm && !stdenv.isMips; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ]; preConfigure = '' diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index f8a7ed920a5..b366f20ffb6 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = !stdenv.isArm && !stdenv.isMips; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; preConfigure = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix index 882af287c04..6c2bc8cb9ca 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = stdenv.isi686 || stdenv.isx86_64; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ]; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "core coreboot all"; # "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installFlags = "-i"; installTargets = "install"; # + optionalString useNativeCompilers " installopt"; prePatch = '' diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index 9b340f69e90..6eca566dd2c 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, ncurses }: +{ stdenv, fetchurl, xlibsWrapper, ncurses }: stdenv.mkDerivation (rec { @@ -10,9 +10,9 @@ stdenv.mkDerivation (rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk" "-x11lib" x11]; + configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; buildFlags = "world bootstrap world.opt"; - buildInputs = [x11 ncurses]; + buildInputs = [xlibsWrapper ncurses]; installTargets = "install installopt"; patchPhase = '' CAT=$(type -tp cat) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f9f628dab60..a0fdea2fc56 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -60530,13 +60530,13 @@ self: { }) {}; "gtk-traymanager" = callPackage - ({ mkDerivation, base, glib, gtk, x11 }: + ({ mkDerivation, base, glib, gtk, xlibsWrapper }: mkDerivation { pname = "gtk-traymanager"; version = "0.1.5"; sha256 = "1582e229aafe22cf5499fe1519e2ff4f49cecbe83a6eb1a8de04f45dd44df443"; libraryHaskellDepends = [ base glib gtk ]; - libraryPkgconfigDepends = [ x11 ]; + libraryPkgconfigDepends = [ xlibsWrapper ]; homepage = "http://github.com/travitch/gtk-traymanager"; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index f5cf11ead97..fe209f6f114 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi -, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11 +, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, xlibsWrapper, libX11 , makeWrapper, callPackage, self }: assert zlibSupport -> zlib != null; @@ -21,7 +21,7 @@ let sha256 = "0xympj874cnjpxj68xm5gllq2f8bbvz8hr0md8mh1yd6fgzzxibh"; }; - buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ] + buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional zlibSupport zlib; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 28f53f8ca95..32974778168 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false -, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, self, callPackage }: +, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage }: assert zlibSupport -> zlib != null; @@ -49,7 +49,7 @@ let buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ - [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ] + [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ] ++ optional zlibSupport zlib; @@ -198,7 +198,7 @@ let tkinter = buildInternalPythonModule { moduleName = "tkinter"; - deps = [ tcl tk x11 ]; + deps = [ tcl tk xlibsWrapper ]; }; readline = buildInternalPythonModule { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 195caa583ad..6f951bc2837 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -5,7 +5,7 @@ , db, gdbm, ncurses, sqlite, readline -, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? !stdenv.isCygwin +, tcl ? null, tk ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? !stdenv.isCygwin , zlib ? null, zlibSupport ? true , expat, libffi @@ -15,7 +15,7 @@ assert zlibSupport -> zlib != null; assert x11Support -> tcl != null && tk != null - && x11 != null + && xlibsWrapper != null && libX11 != null; with stdenv.lib; @@ -92,7 +92,7 @@ let ++ optionals stdenv.isCygwin [ expat libffi ] ++ optionals includeModules ( [ db gdbm ncurses sqlite readline - ] ++ optionals x11Support [ tcl tk x11 libX11 ] + ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] ) ++ optional zlibSupport zlib @@ -249,7 +249,7 @@ let tkinter = if stdenv.isCygwin then null else (buildInternalPythonModule { moduleName = "tkinter"; - deps = [ tcl tk x11 libX11 ]; + deps = [ tcl tk xlibsWrapper libX11 ]; }); } // { diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 1fae5d42ab7..ac895b5113e 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, audiofile, libcap , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null -, x11Support ? true, x11 ? null, libXrandr ? null +, x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -10,7 +10,7 @@ assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport; assert openglSupport -> (mesa != null && x11Support); -assert x11Support -> (x11 != null && libXrandr != null); +assert x11Support -> (xlibsWrapper != null && libXrandr != null); assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> libpulseaudio != null; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. propagatedBuildInputs = - optionals x11Support [ x11 libXrandr ] ++ + optionals x11Support [ xlibsWrapper libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ optional openglSupport mesa ++ diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index f5bd144a717..7573d1e1cd2 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, audiofile , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null -, x11Support ? true, x11 ? null, libXrandr ? null +, x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -10,7 +10,7 @@ assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support); -assert x11Support -> (x11 != null && libXrandr != null); +assert x11Support -> (xlibsWrapper != null && libXrandr != null); assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> libpulseaudio != null; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. - propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ + propagatedBuildInputs = stdenv.lib.optionals x11Support [ xlibsWrapper libXrandr ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; buildInputs = [ pkgconfig audiofile ] ++ diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 454c4e882f5..6084e7074fe 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}: +{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}: stdenv.mkDerivation { name = "Xaw3d-1.5E"; @@ -8,8 +8,8 @@ stdenv.mkDerivation { md5 = "29ecfdcd6bcf47f62ecfd672d31269a1"; }; patches = [./config.patch ./laylex.patch]; - buildInputs = [x11 imake gccmakedep libXmu libXpm libXp bison flex]; - propagatedBuildInputs = [x11 libXmu]; + buildInputs = [imake gccmakedep libXpm libXp bison flex]; + propagatedBuildInputs = [xlibsWrapper libXmu]; meta = { description = "3D widget set based on the Athena Widget set"; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index b8e9fd7966b..97636f7a957 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, cairo, x11, fontconfig, freetype, libsigcxx }: +{ fetchurl, stdenv, pkgconfig, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: stdenv.mkDerivation rec { name = "cairomm-1.11.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ]; + propagatedBuildInputs = [ cairo xlibsWrapper fontconfig freetype libsigcxx ]; meta = with stdenv.lib; { description = "A 2D graphics library with support for multiple output devices"; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 0d262fb061e..8a24445dcca 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, x11 }: +{ stdenv, fetchurl, cmake, xlibsWrapper }: stdenv.mkDerivation rec { version = "18.10"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - buildInputs = [ cmake x11 ]; - propagatedBuildInputs = [ x11 ]; + buildInputs = [ cmake xlibsWrapper ]; + propagatedBuildInputs = [ xlibsWrapper ]; meta = with stdenv.lib; { description = "A general purpose cross-platform C++ machine learning library"; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index d51419f3754..6398e5542ac 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi +{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }: let inherit (composableDerivation) edf; in @@ -11,7 +11,7 @@ composableDerivation.composableDerivation {} rec { sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih"; }; - propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; + propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ]; buildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix index a5b65f09e61..cb71724a360 100644 --- a/pkgs/development/libraries/fltk/fltk13.nix +++ b/pkgs/development/libraries/fltk/fltk13.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi +{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng , cfg ? {} , automake, autoconf, libtool @@ -21,7 +21,7 @@ composableDerivation.composableDerivation {} { --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand' ''; - propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; + propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ]; enableParallelBilding = true; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index dfd2c75184e..2d44444ab40 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }: +{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }: let version = "1.7.9"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; }; - buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; + buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; doCheck = true; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index e966388b2ad..3c823adf91b 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor +{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor , libXrandr, mesa, libXft, libXfixes, xinput }: let @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n"; }; - buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr + buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft mesa libXfixes xinput ]; doCheck = true; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 6159ce7c9e0..368a1e27487 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11, cmake }: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, xlibsWrapper, cmake }: let version = "3.0.0"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ in stdenv.mkDerivation { sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra"; }; - buildInputs = [ libXi libXrandr libXxf86vm mesa x11 cmake ]; + buildInputs = [ libXi libXrandr libXxf86vm mesa xlibsWrapper cmake ]; meta = with stdenv.lib; { description = "Create and manage windows containing OpenGL contexts"; diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index 3ae649b6790..b6e515fef80 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, imlib2 }: +{ stdenv, fetchurl, xlibsWrapper, imlib2 }: stdenv.mkDerivation rec { name = "giblib-1.2.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; }; - buildInputs = [x11 imlib2]; + buildInputs = [xlibsWrapper imlib2]; meta = { homepage = http://linuxbrit.co.uk/giblib/; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 5127311e7c9..cbdc2831187 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }: +{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi }: with stdenv.lib; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1mhkllxz49l1x680dmzrv2i82qjrq017sykah3xc90f2d8qcxfv9"; }; - nativeBuildInputs = [ x11 libXmu libXi ]; + nativeBuildInputs = [ xlibsWrapper libXmu libXi ]; propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h patchPhase = '' diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 087be3bb6de..02d26759834 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11 +{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper , libXinerama, libXcursor }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ - cmake mesa libXrandr libXi libXxf86vm libXfixes x11 + cmake mesa libXrandr libXi libXxf86vm libXfixes xlibsWrapper libXinerama libXcursor ]; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index fec9d16cf95..01f7b6e1065 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs -, gdk_pixbuf, libintlOrEmpty, x11 +, gdk_pixbuf, libintlOrEmpty, xlibsWrapper , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ++ optionals (stdenv.isLinux || stdenv.isDarwin) [ libXrandr libXrender libXcomposite libXi libXcursor ] - ++ optionals stdenv.isDarwin [ x11 libXdamage ] + ++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ] ++ libintlOrEmpty ++ optional xineramaSupport libXinerama ++ optionals cupsSupport [ cups ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 5fb70ac05ea..6fd583e7fee 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gettext, perl , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xlibs, x11, wayland, libxkbcommon, epoxy +, xlibs, xlibsWrapper, wayland, libxkbcommon, epoxy , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null }: diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 50703f907d3..3ff608a4ac3 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: +{ stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: stdenv.mkDerivation rec { name = "imlib2-1.4.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0x1j0ylpclkp8cfpwfpkjywqz124bqskyxbw8pvwzkv2gmrbwldg"; }; - buildInputs = [ x11 libjpeg libtiff giflib libpng bzip2 ]; + buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 4513530e6f0..a2e5d153060 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, x11, python3, libxslt }: +{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3, libxslt }: stdenv.mkDerivation rec { name = "lirc-0.9.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preBuild = "patchShebangs ."; - buildInputs = [ alsaLib help2man pkgconfig x11 python3 libxslt ]; + buildInputs = [ alsaLib help2man pkgconfig xlibsWrapper python3 libxslt ]; configureFlags = [ "--with-driver=devinput" diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 87187667a92..2db67041ec3 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, glib, cairo, libpng, harfbuzz , fontconfig, freetype, libintlOrEmpty, gobjectIntrospection }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isDarwin [ fontconfig ]; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; + propagatedBuildInputs = [ xlibsWrapper glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 872576d9fb0..2c07c1e0858 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -26,7 +26,7 @@ # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11. , mesa ? null -, x11 ? null +, xlibsWrapper ? null , libXmu ? null }: @@ -41,7 +41,7 @@ assert enableXM -> motif != null; # OpenGL/X11 User Interface and Visualisation drivers. assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> mesa != null; -assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> x11 != null; +assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper != null; assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null; let @@ -81,8 +81,8 @@ let }; enableParallelBuilding = true; - buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa x11 libXmu ]; - propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa x11 libXmu ]; + buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; + propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index ffad4418815..08d8f141deb 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -7,7 +7,7 @@ , threadSupport ? true , mysqlSupport ? false, mysql ? null , openglSupport ? false, mesa ? null, libXmu ? null -, x11, xextproto, zlib, libjpeg, libpng, which +, xlibsWrapper, xextproto, zlib, libjpeg, libpng, which }: assert xftSupport -> libXft != null; @@ -30,7 +30,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ which ]; - propagatedBuildInputs = [libpng x11 libXft libXrender zlib libjpeg]; + propagatedBuildInputs = [libpng xlibsWrapper libXft libXrender zlib libjpeg]; configureFlags = " -v diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index d7a0b11a8da..ef2db5ae5a6 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -1,6 +1,6 @@ # alsaLib vorbisTools python can be made optional -{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, x11 }: +{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, xlibsWrapper }: stdenv.mkDerivation { name = "snack-2.2.10"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { postUnpack = ''sourceRoot="$sourceRoot/unix"''; - buildInputs = [ python tcl tk vorbisTools pkgconfig x11 ]; + buildInputs = [ python tcl tk vorbisTools pkgconfig xlibsWrapper ]; postInstall = "aoeu"; diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index 37026ad9344..eb1c01e4eef 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, x11 }: +{ stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "gl"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pure freeglut mesa x11 ]; + propagatedBuildInputs = [ pure freeglut mesa xlibsWrapper ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix index b36a58279fa..0fe1667b040 100644 --- a/pkgs/development/pure-modules/tk/default.nix +++ b/pkgs/development/pure-modules/tk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, x11 }: +{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "tk"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pure tcl tk x11 ]; + propagatedBuildInputs = [ pure tcl tk xlibsWrapper ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 0589bec36b9..cb93ccc2b58 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, x11, isPyPy }: +{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, xlibsWrapper, isPyPy }: if isPyPy then throw "pycairo not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { version = "1.10.0"; @@ -23,7 +23,7 @@ if isPyPy then throw "pycairo not supported for interpreter ${python.executable} sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4"; }; - buildInputs = [ python pkgconfig cairo x11 ]; + buildInputs = [ python pkgconfig cairo xlibsWrapper ]; configurePhase = '' ( diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 62d39d768f9..2d1c1566185 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -289,7 +289,7 @@ let rgdal = [ pkgs.proj pkgs.gdal ]; rgeos = [ pkgs.geos ]; rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ]; - rgl = [ pkgs.mesa pkgs.x11 ]; + rgl = [ pkgs.mesa pkgs.xlibsWrapper ]; Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2 ]; Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; |