diff options
Diffstat (limited to 'pkgs/development/libraries')
22 files changed, 36 insertions, 40 deletions
diff --git a/pkgs/development/libraries/atk/2.2.x.nix b/pkgs/development/libraries/atk/2.2.x.nix index 8f49532c025e..d0f7e1097953 100644 --- a/pkgs/development/libraries/atk/2.2.x.nix +++ b/pkgs/development/libraries/atk/2.2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, glib, xz }: +{ stdenv, fetchurl, pkgconfig, perl, glib }: stdenv.mkDerivation rec { name = "atk-2.2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb"; }; - buildNativeInputs = [ pkgconfig perl xz ]; + buildNativeInputs = [ pkgconfig perl ]; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/atkmm/2.22.x.nix b/pkgs/development/libraries/atkmm/2.22.x.nix index 2d415821fc58..66237c4c7b99 100644 --- a/pkgs/development/libraries/atkmm/2.22.x.nix +++ b/pkgs/development/libraries/atkmm/2.22.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, atk, glibmm, pkgconfig, xz }: +{ stdenv, fetchurl, atk, glibmm, pkgconfig }: stdenv.mkDerivation rec { name = "atkmm-2.22.6"; @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { sha256 = "1dmf72i7jv2a2gavjiah2722bf5qk3hb97hn5dasxqxr0r8jjx0a"; }; - buildInputs = [ xz ]; propagatedBuildInputs = [ atk glibmm ]; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 6b517b918102..11a6e374e2e4 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf , pangoSupport ? true, pango, cairo -, libXfixes, libXcomposite, libXdamage, xz }: +, libXfixes, libXcomposite, libXdamage }: stdenv.mkDerivation rec { name = "cogl-1.8.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1ix87hz3qxqysqwx58wbc46lzchlmfs08fjzbf3l6mmsqj8gs9pc"; }; - buildNativeInputs = [ xz pkgconfig ]; + buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix index eb7eaf91bb07..5c0860196d39 100644 --- a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix +++ b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. buildInputs = [ libX11 ]; - buildNativeInputs = [ pkgconfig xz ]; + buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; diff --git a/pkgs/development/libraries/glib/2.28.x.nix b/pkgs/development/libraries/glib/2.28.x.nix index 3b7f8b18495d..dd613c6ce3c1 100644 --- a/pkgs/development/libraries/glib/2.28.x.nix +++ b/pkgs/development/libraries/glib/2.28.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib, xz }: +{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib }: # TODO: # * Add gio-module-fam @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # configure script looks for d-bus but it is only needed for tests buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - buildNativeInputs = [ perl pkgconfig gettext xz ]; + buildNativeInputs = [ perl pkgconfig gettext ]; propagatedBuildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.30.x.nix index a0d8ac0eff7b..0f1812b4ec56 100644 --- a/pkgs/development/libraries/glib/2.30.x.nix +++ b/pkgs/development/libraries/glib/2.30.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, xz, libffi +{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, libffi , python }: # TODO: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # configure script looks for d-bus but it is only needed for tests buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - buildNativeInputs = [ perl pkgconfig gettext xz python ]; + buildNativeInputs = [ perl pkgconfig gettext python ]; propagatedBuildInputs = [ zlib libffi ]; diff --git a/pkgs/development/libraries/glibmm/2.28.x.nix b/pkgs/development/libraries/glibmm/2.28.x.nix index 3c2c1fbadce4..2c1d9a45c8d3 100644 --- a/pkgs/development/libraries/glibmm/2.28.x.nix +++ b/pkgs/development/libraries/glibmm/2.28.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx, xz }: +{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx }: stdenv.mkDerivation rec { name = src.pkgname; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1qyb8jb9avfzcdyhldxx7qljjhf30czwnh7c2r9p0x4nin2rjkpq"; }; - buildNativeInputs = [pkgconfig xz]; + buildNativeInputs = [pkgconfig]; propagatedBuildInputs = [glib libsigcxx]; meta = { diff --git a/pkgs/development/libraries/glibmm/2.30.x.nix b/pkgs/development/libraries/glibmm/2.30.x.nix index e3565a4e6146..1ed2d0ede625 100644 --- a/pkgs/development/libraries/glibmm/2.30.x.nix +++ b/pkgs/development/libraries/glibmm/2.30.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx, xz }: +{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx }: stdenv.mkDerivation rec { name = src.pkgname; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1d0dxq4iamch8igrnbvbfwkfpvcnjfzyr9iq2x8hi89b9k1kzbd7"; }; - buildNativeInputs = [pkgconfig xz]; + buildNativeInputs = [pkgconfig]; propagatedBuildInputs = [glib libsigcxx]; meta = { diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 3cd8e7180212..e998887f5912 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xz, zlib, lzo, libtasn1, nettle +{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle , guileBindings, guile, perl }: assert guileBindings -> guile != null; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib lzo ] ++ stdenv.lib.optional guileBindings guile; - buildNativeInputs = [ xz perl ]; + buildNativeInputs = [ perl ]; propagatedBuildInputs = [ nettle libtasn1 ]; diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix index e3908b2ba371..c9e95ecc9c36 100644 --- a/pkgs/development/libraries/gtk+/2.24.x.nix +++ b/pkgs/development/libraries/gtk+/2.24.x.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildNativeInputs = [ perl pkgconfig xz ]; + buildNativeInputs = [ perl pkgconfig ]; propagatedBuildInputs = [ xlibs.xlibs glib atk pango gdk_pixbuf cairo diff --git a/pkgs/development/libraries/gtk+/3.2.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix index a72411d16367..ae6b692e44f2 100644 --- a/pkgs/development/libraries/gtk+/3.2.x.nix +++ b/pkgs/development/libraries/gtk+/3.2.x.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildNativeInputs = [ perl pkgconfig xz ]; + buildNativeInputs = [ perl pkgconfig ]; propagatedBuildInputs = [ xlibs.xlibs glib atk pango gdk_pixbuf cairo diff --git a/pkgs/development/libraries/gtkmm/2.24.x.nix b/pkgs/development/libraries/gtkmm/2.24.x.nix index 89e12bc4c1c6..56d151101c5d 100644 --- a/pkgs/development/libraries/gtkmm/2.24.x.nix +++ b/pkgs/development/libraries/gtkmm/2.24.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm, xz }: +{ stdenv, fetchurl_gnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }: stdenv.mkDerivation rec { name = src.pkgname; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369"; }; - buildNativeInputs = [pkgconfig xz]; + buildNativeInputs = [pkgconfig]; propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 25d2f1c44355..ace271b7a357 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, glib, pkgconfig, xz }: +{ stdenv, fetchurl_gnome, glib, pkgconfig }: stdenv.mkDerivation rec { name = src.pkgname; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib ]; - buildNativeInputs = [ pkgconfig xz ]; + buildNativeInputs = [ pkgconfig ]; meta = { homepage = http://live.gnome.org/JsonGlib; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index ab862fd56f0f..36e345043e3c 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, xz, e2fsprogs +{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs , sharutils}: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a"; }; - propagatedBuildInputs = [libxml2 zlib bzip2 xz openssl] ++ + propagatedBuildInputs = [libxml2 zlib bzip2 openssl] ++ (if stdenv.isLinux then [e2fsprogs attr acl] else []); buildInputs = [sharutils]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 0d6637d6116b..3fb1650bf46f 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional xvidSupport "--enable-libxvid" ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; - buildInputs = [ pkgconfig lame yasm xz ] + buildInputs = [ pkgconfig lame yasm ] ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional theoraSupport libtheora diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index f9b864143ec5..97622bb7b24b 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, imagemagick, xz }: +{ stdenv, fetchurl, pkgconfig, imagemagick }: stdenv.mkDerivation rec { name = "libdmtx-0.7.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ pkgconfig ]; - propagatedBuildInputs = [ imagemagick xz ]; + propagatedBuildInputs = [ imagemagick ]; meta = { description = "An open source software for reading and writing Data Matrix barcodes"; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 3f6de4cfb1d7..168a2e7381ef 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0gvq1gbbcl078s3kgdc508jp7p3a3ps34fj4pf8vsamprbikpwm5"; }; - buildNativeInputs = [ xz intltool pkgconfig ]; + buildNativeInputs = [ intltool pkgconfig ]; buildInputs = [ perl perlXMLParser gettext bzip2 gnome_vfs python ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 7ba9bfb54b37..85c2fa13a93a 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, xz }: +{ stdenv, fetchurl, zlib }: assert zlib != null; @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib ]; - buildNativeInputs = [ xz ]; - passthru = { inherit zlib; }; meta = { diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index dc3f8b5352de..d857b6e17ea4 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, xz }: +{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2 }: stdenv.mkDerivation rec { name = "libwpd-0.9.4"; @@ -10,5 +10,5 @@ stdenv.mkDerivation rec { buildInputs = [ glib libgsf libxml2 ]; - buildNativeInputs = [ pkgconfig xz ]; + buildNativeInputs = [ pkgconfig ]; } diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.29.x.nix index b255f05dd23b..5a0ff2b53745 100644 --- a/pkgs/development/libraries/pango/1.29.x.nix +++ b/pkgs/development/libraries/pango/1.29.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, gettext, x11, glib, cairo, libpng, xz }: +{ stdenv, fetchurl_gnome, pkgconfig, gettext, x11, glib, cairo, libpng }: stdenv.mkDerivation rec { name = src.pkgname; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; - buildNativeInputs = [ pkgconfig xz ]; + buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ x11 glib cairo libpng ]; diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix index c004b7160f20..5cd4744fed38 100644 --- a/pkgs/development/libraries/pangomm/2.28.x.nix +++ b/pkgs/development/libraries/pangomm/2.28.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng, xz }: +{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }: stdenv.mkDerivation rec { name = "pangomm-2.28.4"; @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { sha256 = "10kcdpg080m393f1vz0km41kd3483fkyabprm59gvjwklxkcp3bp"; }; - buildInputs = [ xz]; buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ pango glibmm cairomm libpng ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index c8eae2eac4e1..c7de1df71909 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, automoc4, qt4, xz }: +{ stdenv, fetchurl, cmake, automoc4, qt4 }: let v = "4.5.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 ]; - buildNativeInputs = [ cmake automoc4 xz ]; + buildNativeInputs = [ cmake automoc4 ]; cmakeFlags = "-DPHONON_MKSPECS_DIR=mkspecs"; preConfigure = |