diff options
Diffstat (limited to 'pkgs/development/libraries')
21 files changed, 47 insertions, 47 deletions
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 1fae5d42ab7e1..ac895b5113edc 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, audiofile, libcap , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null -, x11Support ? true, x11 ? null, libXrandr ? null +, x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -10,7 +10,7 @@ assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport; assert openglSupport -> (mesa != null && x11Support); -assert x11Support -> (x11 != null && libXrandr != null); +assert x11Support -> (xlibsWrapper != null && libXrandr != null); assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> libpulseaudio != null; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. propagatedBuildInputs = - optionals x11Support [ x11 libXrandr ] ++ + optionals x11Support [ xlibsWrapper libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ optional openglSupport mesa ++ diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index f5bd144a7172f..7573d1e1cd29c 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, audiofile , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null -, x11Support ? true, x11 ? null, libXrandr ? null +, x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -10,7 +10,7 @@ assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support); -assert x11Support -> (x11 != null && libXrandr != null); +assert x11Support -> (xlibsWrapper != null && libXrandr != null); assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> libpulseaudio != null; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. - propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ + propagatedBuildInputs = stdenv.lib.optionals x11Support [ xlibsWrapper libXrandr ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; buildInputs = [ pkgconfig audiofile ] ++ diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 454c4e882f56c..6084e7074fe43 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}: +{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}: stdenv.mkDerivation { name = "Xaw3d-1.5E"; @@ -8,8 +8,8 @@ stdenv.mkDerivation { md5 = "29ecfdcd6bcf47f62ecfd672d31269a1"; }; patches = [./config.patch ./laylex.patch]; - buildInputs = [x11 imake gccmakedep libXmu libXpm libXp bison flex]; - propagatedBuildInputs = [x11 libXmu]; + buildInputs = [imake gccmakedep libXpm libXp bison flex]; + propagatedBuildInputs = [xlibsWrapper libXmu]; meta = { description = "3D widget set based on the Athena Widget set"; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index b8e9fd7966b04..97636f7a9574e 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, cairo, x11, fontconfig, freetype, libsigcxx }: +{ fetchurl, stdenv, pkgconfig, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: stdenv.mkDerivation rec { name = "cairomm-1.11.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ]; + propagatedBuildInputs = [ cairo xlibsWrapper fontconfig freetype libsigcxx ]; meta = with stdenv.lib; { description = "A 2D graphics library with support for multiple output devices"; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 0d262fb061e29..8a24445dcca7c 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, x11 }: +{ stdenv, fetchurl, cmake, xlibsWrapper }: stdenv.mkDerivation rec { version = "18.10"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - buildInputs = [ cmake x11 ]; - propagatedBuildInputs = [ x11 ]; + buildInputs = [ cmake xlibsWrapper ]; + propagatedBuildInputs = [ xlibsWrapper ]; meta = with stdenv.lib; { description = "A general purpose cross-platform C++ machine learning library"; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index d51419f37540d..6398e5542ac33 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi +{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }: let inherit (composableDerivation) edf; in @@ -11,7 +11,7 @@ composableDerivation.composableDerivation {} rec { sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih"; }; - propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; + propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ]; buildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix index a5b65f09e613d..cb71724a36045 100644 --- a/pkgs/development/libraries/fltk/fltk13.nix +++ b/pkgs/development/libraries/fltk/fltk13.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi +{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng , cfg ? {} , automake, autoconf, libtool @@ -21,7 +21,7 @@ composableDerivation.composableDerivation {} { --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand' ''; - propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; + propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ]; enableParallelBilding = true; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index dfd2c75184ee8..2d44444ab40de 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }: +{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }: let version = "1.7.9"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; }; - buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; + buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; doCheck = true; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index e966388b2ad96..3c823adf91b6d 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor +{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor , libXrandr, mesa, libXft, libXfixes, xinput }: let @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n"; }; - buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr + buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft mesa libXfixes xinput ]; doCheck = true; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 6159ce7c9e0a4..368a1e2748788 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11, cmake }: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, xlibsWrapper, cmake }: let version = "3.0.0"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ in stdenv.mkDerivation { sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra"; }; - buildInputs = [ libXi libXrandr libXxf86vm mesa x11 cmake ]; + buildInputs = [ libXi libXrandr libXxf86vm mesa xlibsWrapper cmake ]; meta = with stdenv.lib; { description = "Create and manage windows containing OpenGL contexts"; diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index 3ae649b67902a..b6e515fef8030 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, imlib2 }: +{ stdenv, fetchurl, xlibsWrapper, imlib2 }: stdenv.mkDerivation rec { name = "giblib-1.2.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; }; - buildInputs = [x11 imlib2]; + buildInputs = [xlibsWrapper imlib2]; meta = { homepage = http://linuxbrit.co.uk/giblib/; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 5127311e7c919..cbdc28311877e 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }: +{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi }: with stdenv.lib; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1mhkllxz49l1x680dmzrv2i82qjrq017sykah3xc90f2d8qcxfv9"; }; - nativeBuildInputs = [ x11 libXmu libXi ]; + nativeBuildInputs = [ xlibsWrapper libXmu libXi ]; propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h patchPhase = '' diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 087be3bb6de0a..02d26759834cf 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11 +{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper , libXinerama, libXcursor }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ - cmake mesa libXrandr libXi libXxf86vm libXfixes x11 + cmake mesa libXrandr libXi libXxf86vm libXfixes xlibsWrapper libXinerama libXcursor ]; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index fec9d16cf959a..01f7b6e1065df 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs -, gdk_pixbuf, libintlOrEmpty, x11 +, gdk_pixbuf, libintlOrEmpty, xlibsWrapper , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ++ optionals (stdenv.isLinux || stdenv.isDarwin) [ libXrandr libXrender libXcomposite libXi libXcursor ] - ++ optionals stdenv.isDarwin [ x11 libXdamage ] + ++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ] ++ libintlOrEmpty ++ optional xineramaSupport libXinerama ++ optionals cupsSupport [ cups ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 5fb70ac05ea9f..6fd583e7fee78 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gettext, perl , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xlibs, x11, wayland, libxkbcommon, epoxy +, xlibs, xlibsWrapper, wayland, libxkbcommon, epoxy , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null }: diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 50703f907d347..3ff608a4ac330 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: +{ stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: stdenv.mkDerivation rec { name = "imlib2-1.4.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0x1j0ylpclkp8cfpwfpkjywqz124bqskyxbw8pvwzkv2gmrbwldg"; }; - buildInputs = [ x11 libjpeg libtiff giflib libpng bzip2 ]; + buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 4513530e6f09b..a2e5d153060bd 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, x11, python3, libxslt }: +{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3, libxslt }: stdenv.mkDerivation rec { name = "lirc-0.9.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preBuild = "patchShebangs ."; - buildInputs = [ alsaLib help2man pkgconfig x11 python3 libxslt ]; + buildInputs = [ alsaLib help2man pkgconfig xlibsWrapper python3 libxslt ]; configureFlags = [ "--with-driver=devinput" diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 87187667a922c..2db67041ec347 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, glib, cairo, libpng, harfbuzz , fontconfig, freetype, libintlOrEmpty, gobjectIntrospection }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isDarwin [ fontconfig ]; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; + propagatedBuildInputs = [ xlibsWrapper glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 872576d9fb02b..2c07c1e085801 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -26,7 +26,7 @@ # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11. , mesa ? null -, x11 ? null +, xlibsWrapper ? null , libXmu ? null }: @@ -41,7 +41,7 @@ assert enableXM -> motif != null; # OpenGL/X11 User Interface and Visualisation drivers. assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> mesa != null; -assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> x11 != null; +assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper != null; assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null; let @@ -81,8 +81,8 @@ let }; enableParallelBuilding = true; - buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa x11 libXmu ]; - propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa x11 libXmu ]; + buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; + propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index ffad441881543..08d8f141deb0b 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -7,7 +7,7 @@ , threadSupport ? true , mysqlSupport ? false, mysql ? null , openglSupport ? false, mesa ? null, libXmu ? null -, x11, xextproto, zlib, libjpeg, libpng, which +, xlibsWrapper, xextproto, zlib, libjpeg, libpng, which }: assert xftSupport -> libXft != null; @@ -30,7 +30,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ which ]; - propagatedBuildInputs = [libpng x11 libXft libXrender zlib libjpeg]; + propagatedBuildInputs = [libpng xlibsWrapper libXft libXrender zlib libjpeg]; configureFlags = " -v diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index d7a0b11a8daba..ef2db5ae5a6af 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -1,6 +1,6 @@ # alsaLib vorbisTools python can be made optional -{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, x11 }: +{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, xlibsWrapper }: stdenv.mkDerivation { name = "snack-2.2.10"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { postUnpack = ''sourceRoot="$sourceRoot/unix"''; - buildInputs = [ python tcl tk vorbisTools pkgconfig x11 ]; + buildInputs = [ python tcl tk vorbisTools pkgconfig xlibsWrapper ]; postInstall = "aoeu"; |