diff options
Diffstat (limited to 'pkgs/development/libraries')
17 files changed, 41 insertions, 41 deletions
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 940fc2bb6cc6..7e6286abcce3 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi +{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi , intltool, dbus_glib, at_spi2_core, libSM }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1y9gfz1iz3wpja7s000f0bmyyvc6im5fcdl6bxwbz0v3qdgc9vvq"; }; - buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi + buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi intltool dbus_glib at_spi2_core libSM ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 81c23f7e41ce..b4dd865dec01 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib -, enableX11 ? true, xlibs +, enableX11 ? true, xorg , enableSDL ? true, SDL }: let s = @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ] ++ stdenv.lib.optional enableSDL SDL - ++ stdenv.lib.optionals enableX11 (with xlibs; [ + ++ stdenv.lib.optionals enableX11 (with xorg; [ xproto libX11 libXext #xextproto #renderproto libXrender ]); diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index 86ebaa0d8d91..fa8e9f0ef2c9 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true -, stdenv, fetchurl, pkgconfig, xlibs, xorgserver, xinput }: +, stdenv, fetchurl, pkgconfig, xorg, xorgserver, xinput }: stdenv.mkDerivation rec { name = "frame-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv pkgconfig - ] ++ stdenv.lib.optional enableX11 [xlibs.xorgserver xlibs.libX11 xlibs.libXext xlibs.libXi]; + ] ++ stdenv.lib.optional enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi]; configureFlags = stdenv.lib.optional enableX11 "--with-x11"; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 24c24fe5f123..5ef53ec79391 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true -, stdenv, fetchurl, pkgconfig, xlibs, xorgserver, python3, dbus_libs, frame, grail }: +, stdenv, fetchurl, pkgconfig, xorg, xorgserver, python3, dbus_libs, frame, grail }: stdenv.mkDerivation rec { name = "geis-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig python3 dbus_libs frame grail ] - ++ stdenv.lib.optional enableX11 [xlibs.libX11 xlibs.libXtst xlibs.libXext xlibs.libXi xlibs.xorgserver]; + ++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.xorgserver]; configureFlags = stdenv.lib.optional enableX11"--enable-x11"; diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index 3cf946bb4ba5..a4f27824d136 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true, - stdenv, fetchurl, pkgconfig, xlibs, python3, frame }: + stdenv, fetchurl, pkgconfig, xorg, python3, frame }: stdenv.mkDerivation rec { name = "grail-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig python3 frame ] - ++ stdenv.lib.optional enableX11 [xlibs.libX11 xlibs.libXtst xlibs.libXext xlibs.libXi xlibs.libXfixes]; + ++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes]; configureFlags = stdenv.lib.optional enableX11 "--with-x11"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 510ff86d1cf6..eb55ae874e5a 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia +{ fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc , libintlOrEmpty , # Whether to build no plugins that have external dependencies @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # can't build alsaLib on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib ++ stdenv.lib.optionals (!minimalDeps) - [ xlibs.xlibsWrapper xlibs.libXv libogg libtheora libvorbis freetype pango + [ xorg.xlibsWrapper xorg.libXv libogg libtheora libvorbis freetype pango liboil ] # can't build cdparanoia on darwin ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 01f7b6e1065d..e821e693b0ce 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs +{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg , gdk_pixbuf, libintlOrEmpty, xlibsWrapper , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null }: -assert xineramaSupport -> xlibs.libXinerama != null; +assert xineramaSupport -> xorg.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig gettext ]; - propagatedBuildInputs = with xlibs; with stdenv.lib; + propagatedBuildInputs = with xorg; with stdenv.lib; [ glib cairo pango gdk_pixbuf atk ] ++ optionals (stdenv.isLinux || stdenv.isDarwin) [ libXrandr libXrender libXcomposite libXi libXcursor diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 6fd583e7fee7..1929dd01c6b8 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gettext, perl , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xlibs, xlibsWrapper, wayland, libxkbcommon, epoxy +, xorg, xlibsWrapper, wayland, libxkbcommon, epoxy , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null }: -assert xineramaSupport -> xlibs.libXinerama != null; +assert xineramaSupport -> xorg.libXinerama != null; assert cupsSupport -> cups != null; let @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; buildInputs = [ libxkbcommon epoxy ]; - propagatedBuildInputs = with xlibs; with stdenv.lib; + propagatedBuildInputs = with xorg; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] ++ optionals stdenv.isLinux [ wayland ] ++ optional xineramaSupport libXinerama diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 7b86403b0aaf..2fa9cf7dbf95 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, xlibs, libjpeg }: +{ stdenv, fetchurl, unzip, xorg, libjpeg }: stdenv.mkDerivation rec { name = "jasper-1.900.1"; diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix index d5bb3f78ce85..8196aeab6c2b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix @@ -116,7 +116,7 @@ let { inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme libgcrypt libgit2 modemmanager networkmanager perl - perlPackages qimageblitz xlibs zlib; + perlPackages qimageblitz xorg zlib; boost = boost156; gif = giflib; glib2 = glib; @@ -147,7 +147,7 @@ let }); frameworkintegration = extendDerivation super.frameworkintegration { - buildInputs = [ scope.xlibs.libXcursor ]; + buildInputs = [ scope.xorg.libXcursor ]; }; kauth = extendDerivation super.kauth { @@ -164,7 +164,7 @@ let }; kdelibs4support = extendDerivation super.kdelibs4support { - buildInputs = [ scope.networkmanager scope.xlibs.libSM ]; + buildInputs = [ scope.networkmanager scope.xorg.libSM ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXML4_DTD_VERSION=4.5" diff --git a/pkgs/development/libraries/kde-frameworks-5.12/default.nix b/pkgs/development/libraries/kde-frameworks-5.12/default.nix index d8f51fe7eb78..1b42bab42639 100644 --- a/pkgs/development/libraries/kde-frameworks-5.12/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.12/default.nix @@ -116,7 +116,7 @@ let { inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme libgcrypt libgit2 modemmanager networkmanager perl - perlPackages qimageblitz xlibs zlib; + perlPackages qimageblitz xorg zlib; boost = boost156; gif = giflib; glib2 = glib; @@ -154,7 +154,7 @@ let }); frameworkintegration = extendDerivation super.frameworkintegration { - buildInputs = [ scope.xlibs.libXcursor ]; + buildInputs = [ scope.xorg.libXcursor ]; }; kauth = extendDerivation super.kauth { @@ -171,7 +171,7 @@ let }; kdelibs4support = extendDerivation super.kdelibs4support { - buildInputs = [ scope.networkmanager scope.xlibs.libSM ]; + buildInputs = [ scope.networkmanager scope.xorg.libSM ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXML4_DTD_VERSION=4.5" diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index 4dc103515ac7..4dca6b57c75a 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libclthreads, libX11, libXft, xlibs }: +{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg }: stdenv.mkDerivation rec { name = "libclxclient-${version}"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0"; }; - buildInputs = [ libclthreads libX11 libXft xlibs.xproto ]; + buildInputs = [ libclthreads libX11 libXft xorg.xproto ]; - NIX_CFLAGS_COMPILE = "-I${xlibs.xproto}/include -I${libXft}/include"; + NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft}/include"; patchPhase = '' sed -e "s@ldconfig@@" -i Makefile diff --git a/pkgs/development/libraries/libcm/default.nix b/pkgs/development/libraries/libcm/default.nix index 2b34f282d2a1..1d4e96d55b6d 100644 --- a/pkgs/development/libraries/libcm/default.nix +++ b/pkgs/development/libraries/libcm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, xlibs, mesa}: +{stdenv, fetchurl, pkgconfig, glib, xorg, mesa}: stdenv.mkDerivation { name = "libcm-0.1.1"; @@ -7,8 +7,8 @@ stdenv.mkDerivation { sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn"; }; buildInputs = [ - pkgconfig glib xlibs.xlibsWrapper xlibs.libXdamage xlibs.libXcomposite - xlibs.libXtst xlibs.inputproto + pkgconfig glib xorg.xlibsWrapper xorg.libXdamage xorg.libXcomposite + xorg.libXtst xorg.inputproto # !!! inputproto should really be propagated by libXtst ]; propagatedBuildInputs = [mesa]; diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index d1a049d78a72..0f46fec5a9af 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -2,7 +2,7 @@ , libXfixes, freetype, fontconfig, zlib, libjpeg, libpng , mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi -, gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage +, gdk_pixbuf, python, gdb, xorg, libX11, libxcb, xcbutil, xcbutilimage , xcbutilkeysyms, xcbutilwm, udev, libxml2, libxslt, pcre, libxkbcommon , alsaLib, gstreamer, gst_plugins_base , libpulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; propagatedBuildInputs = [ - xlibs.libXcomposite libX11 libxcb libXext libXrender libXi + xorg.libXcomposite libX11 libxcb libXext libXrender libXi fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre zlib libjpeg libpng libtiff sqlite icu libwebp alsaLib gstreamer gst_plugins_base libpulseaudio diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 2e4a1c1c161a..30d53eb874be 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll , srcs, version -, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi +, xorg, libX11, libxcb, libXcursor, libXext, libXrender, libXi , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon , fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre , zlib, libjpeg, libpng, libtiff, sqlite, icu @@ -163,7 +163,7 @@ stdenv.mkDerivation { PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; propagatedBuildInputs = [ - xlibs.libXcomposite libX11 libxcb libXext libXrender libXi + xorg.libXcomposite libX11 libxcb libXext libXrender libXi fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre zlib libjpeg libpng libtiff sqlite icu xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index bde3f6e4efb9..0ed4f24ef86b 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, unzip, xlibs }: +{ stdenv, requireFile, unzip, xorg }: assert stdenv.system == "i686-linux"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; - libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.cc.cc ]; + libraries = [ xorg.libXpm xorg.libXt xorg.libX11 xorg.libICE xorg.libSM stdenv.cc.cc ]; meta = { homepage = http://java.sun.com/products/sjwtoolkit/download.html; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index e503ade3ebc4..cf14490c5147 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, bashInteractive, autoconf, automake, libtool, pkgconfig -, git, xlibs, gnum4, libxcb, gperf }: +, git, xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { name = "xcb-util-cursor-0.1.1-3-gf03cc27"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { libtool libxcb pkgconfig - xlibs.utilmacros - xlibs.xcbutilimage - xlibs.xcbutilrenderutil + xorg.utilmacros + xorg.xcbutilimage + xorg.xcbutilrenderutil ]; configurePhase = '' |