public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
This commit is contained in:
Eelco Dolstra
2012-01-18 20:53:01 +00:00
parent c556a6ea46
commit d4d7931a62
70 changed files with 117 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/guile/default.nix
View File

@@ -1,4 +1,4 @@
{ fetchurl, stdenv, xz, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
, libffi, gawk, makeWrapper, coverageAnalysis ? null }:
# Do either a coverage analysis build or a standard build.
@@ -14,7 +14,7 @@ rec {
sha256 = "14rhlpxxa4v5y3gl992l7lnd5qnqawx0a84idnwq0w2qviwcvsyj";
};
buildNativeInputs = [ xz makeWrapper gawk pkgconfig ];
buildNativeInputs = [ makeWrapper gawk pkgconfig ];
buildInputs = [ readline libtool libunistring libffi ];
propagatedBuildInputs = [ gmp boehmgc ]

4
pkgs/development/libraries/atk/2.2.x.nix
View File

@@ -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 ];

3
pkgs/development/libraries/atkmm/2.22.x.nix
View File

@@ -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 ];

4
pkgs/development/libraries/cogl/default.nix
View File

@@ -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 ];

2
pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
View File

@@ -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 ];

4
pkgs/development/libraries/glib/2.28.x.nix
View File

@@ -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 ];

4
pkgs/development/libraries/glib/2.30.x.nix
View File

@@ -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 ];

4
pkgs/development/libraries/glibmm/2.28.x.nix
View File

@@ -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 = {

4
pkgs/development/libraries/glibmm/2.30.x.nix
View File

@@ -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 = {

4
pkgs/development/libraries/gnutls/default.nix
View File

@@ -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 ];

2
pkgs/development/libraries/gtk+/2.24.x.nix
View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
buildNativeInputs = [ perl pkgconfig xz ];
buildNativeInputs = [ perl pkgconfig ];
propagatedBuildInputs =
[ xlibs.xlibs glib atk pango gdk_pixbuf cairo

2
pkgs/development/libraries/gtk+/3.2.x.nix
View File

@@ -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

4
pkgs/development/libraries/gtkmm/2.24.x.nix
View File

@@ -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 ];

4
pkgs/development/libraries/json-glib/default.nix
View File

@@ -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;

4
pkgs/development/libraries/libarchive/default.nix
View File

@@ -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];

2
pkgs/development/libraries/libav/default.nix
View File

@@ -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

4
pkgs/development/libraries/libdmtx/default.nix
View File

@@ -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";

2
pkgs/development/libraries/libgsf/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0gvq1gbbcl078s3kgdc508jp7p3a3ps34fj4pf8vsamprbikpwm5";
};
buildNativeInputs = [ xz intltool pkgconfig ];
buildNativeInputs = [ intltool pkgconfig ];
buildInputs =
[ perl perlXMLParser gettext bzip2 gnome_vfs python ];

4
pkgs/development/libraries/libpng/default.nix
View File

@@ -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 = {

4
pkgs/development/libraries/libwpd/default.nix
View File

@@ -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 ];
}

4
pkgs/development/libraries/pango/1.29.x.nix
View File

@@ -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 ];

3
pkgs/development/libraries/pangomm/2.28.x.nix
View File

@@ -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 ];

4
pkgs/development/libraries/phonon/default.nix
View File

@@ -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 =

4
pkgs/development/tools/misc/cppi/default.nix
View File

@@ -1,4 +1,4 @@
{ fetchurl, xz, stdenv }:
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "cppi-1.15";
@@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
sha256 = "1avwwpcwx6rvk9j4id8jq58n5kk756dwnd0wqw4a4p3smvby7gw2";
};
buildInputs = [ xz ];
doCheck = true;
meta = {

4
pkgs/development/tools/misc/elfutils/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, m4, zlib, bzip2, xz, bison, flex, gettext}:
{stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext}:
# TODO: Look at the hardcoded paths to kernel, modules etc.
stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
# We need bzip2 in NativeInputs because otherwise we can't unpack the src,
# as the host-bzip2 will be in the path.
buildNativeInputs = [m4 bison flex gettext bzip2];
buildInputs = [zlib bzip2 xz];
buildInputs = [zlib bzip2];
crossAttrs = {