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. 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -12,7 +12,6 @@
, libtool
, jasper
, libX11
, xz
, tetex ? null
, librsvg ? null
}:
@ -41,8 +40,6 @@ stdenv.mkDerivation rec {
buildInputs = [ tetex graphviz ];
buildNativeInputs = [ xz ];
preConfigure = if tetex != null then
''
export DVIDecodeDelegate=${tetex}/bin/dvips

4
pkgs/applications/graphics/dia/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl_gnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext
, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
, withGNOME ? false, libgnomeui, xz }:
, withGNOME ? false, libgnomeui }:
stdenv.mkDerivation rec {
name = src.pkgname;
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
libxslt docbook_xsl libart_lgpl
] ++ stdenv.lib.optional withGNOME libgnomeui;
buildNativeInputs = [ pkgconfig intltool perl xz ];
buildNativeInputs = [ pkgconfig intltool perl ];
configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome";

2
pkgs/applications/misc/calibre/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
inherit python;
buildNativeInputs = [ makeWrapper xz pkgconfig ];
buildNativeInputs = [ makeWrapper pkgconfig ];
buildInputs =
[ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg

2
pkgs/applications/misc/lyx/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "a790951d6ed660b254e82d682b478665f119dd522ab4759fdeb5cd8d42f66f61";
};
buildInputs = [texLive qt python makeWrapper xz ];
buildInputs = [texLive qt python makeWrapper ];
# don't ask me why it can't find libX11.so.6
postInstall = ''

4
pkgs/applications/networking/browsers/icecat-3/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
{ fetchurl, stdenv, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib
, libnotify, gnome_vfs, libgnomeui
, freetype, fontconfig, wirelesstools ? null, pixman
@ -19,7 +19,7 @@ stdenv.mkDerivation {
};
buildInputs =
[ xz libgnomeui libnotify gnome_vfs alsaLib
[ libgnomeui libnotify gnome_vfs alsaLib
pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman
python ply dbus dbus_glib pango freetype fontconfig
xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt

2
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -15,8 +15,6 @@ in
stdenv.mkDerivation rec {
name = "opera-11.51-1087";
buildNativeInputs = [ xz ];
src =
if stdenv.system == "i686-linux" then
fetchurl {

4
pkgs/applications/science/electronics/gtkwave/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz, tcl, tk, judy} :
{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy} :
stdenv.mkDerivation rec {
name = "gtkwave-3.3.28";
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
sha256 = "0y3dmx39xwc3m23fwjkxvp9gqxpckk8s5814nhs8fnxa384z5cz0";
};
buildInputs = [ gtk gperf pkgconfig bzip2 xz tcl tk judy];
buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy];
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ];

4
pkgs/applications/version-management/meld/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, xz, pygtk, python, intltool, scrollkeeper, makeWrapper }:
{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }:
let
minor = "1.5";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
sha256 = "05rbkqflbqnh2c4682d2fmidhwz2bvlggrhp1p7xbi3z8ci87pdx";
};
buildInputs = [ pygtk python intltool scrollkeeper makeWrapper xz ];
buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ];
patchPhase = ''
sed -e s,/usr/local,$out, -i INSTALL

4
pkgs/applications/video/xine-ui/default.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl
, lirc, xz, shared_mime_info }:
, lirc, shared_mime_info }:
stdenv.mkDerivation rec {
name = "xine-ui-0.99.6";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1wwylnckm5kfq5fi154w8jqf5cwvp7c1ani15q7sgfrfdkmy7caf";
};
buildNativeInputs = [ xz pkgconfig shared_mime_info ];
buildNativeInputs = [ pkgconfig shared_mime_info ];
buildInputs =
[ xineLib libpng readline ncurses curl lirc

4
pkgs/applications/window-managers/awesome/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua
{stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua
, glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil
, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau
, libXdmcp, pixman, doxygen
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "576b4f6d2c3f56dfbe52ad92f2eecece111f0f05816e32126cd03d4b4387761d";
};
buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango
buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango
imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm
libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen
asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ];

4
pkgs/data/fonts/cantarell-fonts/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xz }:
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "cantarell-fonts-0.0.7";
@ -8,8 +8,6 @@ stdenv.mkDerivation {
sha256 = "1410ywvi951ngmx58g339phzsaf1rgjja6i0xvg49r4ds90zh8ba";
};
buildNativeInputs = [ xz ];
meta = {
maintainers = [ stdenv.lib.maintainers.urkud ];
platforms = stdenv.lib.platforms.all;

4
pkgs/desktops/gnome-2/platform/audiofile/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, xz, alsaLib}:
{stdenv, fetchurl, alsaLib}:
stdenv.mkDerivation {
name = "audiofile-0.3.2";
@ -8,7 +8,5 @@ stdenv.mkDerivation {
sha256 = "185j69j6b0vp6h6bb4j4ipvcyysxf63ghxnvdhh8kbc7ixm71hgs";
};
buildNativeInputs = [ xz ];
buildInputs = [ alsaLib ];
}

4
pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, xz,
{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig,
intltool }:
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
};
propagatedBuildInputs = [ glib dbus_libs libgcrypt ];
buildNativeInputs = [ pkgconfig xz intltool ];
buildNativeInputs = [ pkgconfig intltool ];
meta = {
inherit (glib.meta) platforms maintainers;

4
pkgs/desktops/gnome-3/platform/GConf.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl_gnome, glib, dbus_glib, pkgconfig, xz, libxml2, gtk, intltool }:
{ stdenv, fetchurl_gnome, glib, dbus_glib, pkgconfig, libxml2, gtk, intltool }:
stdenv.mkDerivation rec {
name = src.pkgname;
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
propagatedBuildInputs = [ glib dbus_glib libxml2 gtk ];
buildNativeInputs = [ pkgconfig xz intltool ];
buildNativeInputs = [ pkgconfig intltool ];
configureFlags = "--disable-orbit";

4
pkgs/desktops/gnome-3/platform/clutter.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glib, xz, pkgconfig, mesa, libX11, libXext, libXfixes
{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib }:
stdenv.mkDerivation {
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "0bzsvnharawfg525lpavrp55mq4aih5nb01dwwqwnccg8hk9z2fw";
};
buildNativeInputs = [ xz pkgconfig ];
buildNativeInputs = [ pkgconfig ];
buildInputs =
[ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
atk json_glib

4
pkgs/desktops/gnome-3/platform/glib-networking.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glib, xz, pkgconfig, intltool, gnutls, libgcrypt
{ stdenv, fetchurl, glib, pkgconfig, intltool, gnutls, libgcrypt
, gsettings_desktop_schemas }:
stdenv.mkDerivation {
@ -11,7 +11,7 @@ stdenv.mkDerivation {
propagatedBuildInputs = [ glib gnutls libgcrypt ];
buildInputs = [ gsettings_desktop_schemas ];
buildNativeInputs = [ xz pkgconfig intltool ];
buildNativeInputs = [ pkgconfig intltool ];
configureFlags = "--without-ca-certificates";
postConfigure = "export makeFlags=GIO_MODULE_DIR=$out/${glib.gioModuleDir}";

4
pkgs/desktops/gnome-3/platform/gnome-user-docs.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xz, itstool, libxml2, gettext }:
{ stdenv, fetchurl, itstool, libxml2, gettext }:
stdenv.mkDerivation {
name = "gnome-user-docs-3.2.2";
@ -8,5 +8,5 @@ stdenv.mkDerivation {
sha256 = "1ka0nw2kc85p10y8x31v0wv06a88k7qrgafp4ys04y9fzz0rkcjj";
};
buildNativeInputs = [ xz itstool libxml2 gettext ];
buildNativeInputs = [ itstool libxml2 gettext ];
}

4
pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xz, glib, pkgconfig, intltool }:
{ stdenv, fetchurl, glib, pkgconfig, intltool }:
stdenv.mkDerivation {
name = "gsettings-desktop-schemas-3.2.0";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
};
buildInputs = [ glib ];
buildNativeInputs = [ pkgconfig xz intltool ];
buildNativeInputs = [ pkgconfig intltool ];
meta = {
inherit (glib.meta) maintainers platforms;

4
pkgs/desktops/gnome-3/platform/libgnome-keyring.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, xz,
{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig,
intltool }:
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
};
propagatedBuildInputs = [ glib dbus_libs libgcrypt ];
buildNativeInputs = [ pkgconfig xz intltool ];
buildNativeInputs = [ pkgconfig intltool ];
meta = {
inherit (glib.meta) platforms maintainers;

2
pkgs/desktops/gnome-3/platform/libsoup.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation {
};
buildNativeInputs = [ pkgconfig xz ];
buildNativeInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
passthru.propagatedUserEnvPackages = [ glib_networking ];

4
pkgs/desktops/kde-4.7/kde-runtime.nix
View File

@ -1,10 +1,10 @@
{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica
{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
, libcanberra, virtuoso, samba, ntrack
}:
kde {
buildInputs =
[ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica
[ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica
samba (libcanberra.override { gtk = null; }) ntrack
];

7
pkgs/desktops/kde-4.7/kdelibs.nix
View File

@ -1,6 +1,6 @@
{ kde, gcc, cmake, perl
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
, xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
, getopt, udev, herqq, phonon, libjpeg
@ -8,10 +8,9 @@
kde {
buildInputs =
[
acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper
[ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper
libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2
shared_desktop_ontologies udev xz libxml2 libjpeg
shared_desktop_ontologies udev libxml2 libjpeg
];
propagatedBuildInputs = [ qt4 soprano strigi phonon ];

4
pkgs/desktops/kde-4.7/kdeutils/ark.nix
View File

@ -1,7 +1,7 @@
{ kde, kdelibs, libarchive, xz, bzip2, kde_baseapps }:
{ kde, kdelibs, libarchive, bzip2, kde_baseapps }:
kde {
buildInputs = [ kdelibs kde_baseapps libarchive xz bzip2 ];
buildInputs = [ kdelibs kde_baseapps libarchive bzip2 ];
meta = {
description = "KDE Archiving Tool";

4
pkgs/desktops/kde-4.8/kde-runtime.nix
View File

@ -1,10 +1,10 @@
{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica
{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
, libcanberra, virtuoso, samba, ntrack, libjpeg
}:
kde {
buildInputs =
[ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica
[ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica
samba (libcanberra.override { gtk = null; }) ntrack libjpeg
];

2
pkgs/desktops/kde-4.8/kdelibs.nix
View File

@ -1,6 +1,6 @@
{ kde, gcc, cmake, perl
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
, xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
, getopt, udev, herqq, phonon, libjpeg

4
pkgs/desktops/kde-4.8/kdeutils/ark.nix
View File

@ -1,7 +1,7 @@
{ kde, kdelibs, libarchive, xz, bzip2, kde_baseapps }:
{ kde, kdelibs, libarchive, bzip2, kde_baseapps }:
kde {
buildInputs = [ kdelibs kde_baseapps libarchive xz bzip2 ];
buildInputs = [ kdelibs kde_baseapps libarchive bzip2 ];
meta = {
description = "KDE Archiving Tool";

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

4
pkgs/os-specific/linux/upower/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xz, pkgconfig, glib, dbus, dbus_glib, polkit
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, polkit
, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils }:
assert stdenv.isLinux;
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ];
buildNativeInputs = [ xz pkgconfig ];
buildNativeInputs = [ pkgconfig ];
configureFlags = "--with-backend=linux --localstatedir=/var";

4
pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix
View File

@ -1,4 +1,4 @@
args @ {stdenv, fetchurl, xz, runCommand, userModeLinux ? false, extraConfig ? "",
args @ {stdenv, fetchurl, runCommand, userModeLinux ? false, extraConfig ? "",
kernelPatches ? [], extraMeta ? {},
features ? {}, preConfigure ? "",
...}:
@ -20,7 +20,7 @@ import ../kernel/generic.nix (
kernelPatches = [
{
name = "zen4";
patch = runCommand "2.6.32-zen4.patch" {} "${xz}/bin/lzma -d < ${ fetchurl {
patch = runCommand "2.6.32-zen4.patch" {} "lzma -d < ${ fetchurl {
name = "2.6.32-zen4";
url = "http://downloads.zen-kernel.org/2.6.32/2.6.32-zen4.patch.lzma";
sha256 = "1dyp9sfigqjfqw1c94010c521bhcy1xnzp91kkhg3dwgzfpsp2k2";

4
pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix
View File

@ -1,4 +1,4 @@
args @ {stdenv, fetchurl, xz, runCommand, userModeLinux ? false, extraConfig ? "",
args @ {stdenv, fetchurl, runCommand, userModeLinux ? false, extraConfig ? "",
kernelPatches ? [], extraMeta ? {},
features ? {}, preConfigure ? "",
...}:
@ -23,7 +23,7 @@ import ../kernel/generic.nix (
kernelPatches = [
{
name = "${ZenSuffix}";
patch = runCommand "${baseKernelVersion}-${ZenSuffix}.patch" {} "${xz}/bin/lzma -d < ${ fetchurl {
patch = runCommand "${baseKernelVersion}-${ZenSuffix}.patch" {} "lzma -d < ${ fetchurl {
name = "${baseKernelVersion}-${ZenSuffix}.patch.lzma";
url = "http://downloads.zen-kernel.org/${baseKernelVersion}/${baseKernelVersion}-${ZenSuffix}.patch.lzma";
sha256 = "0a72d8allr4qi4p6hbbjh33kmcgbg84as0dfb50gsffvaj2d3kwf";

4
pkgs/servers/http/myserver/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls
, libxml2, zlib, guile, texinfo, cppunit, xz, psmisc }:
, libxml2, zlib, guile, texinfo, cppunit, psmisc }:
let version = "0.11"; in
stdenv.mkDerivation (rec {
@ -14,7 +14,7 @@ let version = "0.11"; in
[ ./disable-dns-lookup-in-chroot.patch ];
buildInputs =
[ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo xz ]
[ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo ]
++ stdenv.lib.optional doCheck cppunit;
makeFlags = [ "V=1" ];

4
pkgs/servers/pulseaudio/default.nix
View File

@ -3,7 +3,7 @@
, alsaLib, libsamplerate, libsndfile, speex, bluez, udev
, jackaudioSupport ? false, jackaudio ? null
, x11Support ? false, xlibs
, xz, json_c
, json_c
}:
assert jackaudioSupport -> jackaudio != null;
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig gnum4 libtool intltool glib dbus avahi
libsamplerate libsndfile speex alsaLib bluez udev
xz json_c
json_c
#gtk gconf
]
++ stdenv.lib.optional jackaudioSupport jackaudio

2
pkgs/tools/filesystems/squashfs/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0sh40r7gz81fg7ivgr7rld8spvqb6hsfvnf6gd3gbcr5b830v1rs";
};
buildInputs = [zlib attr xz];
buildInputs = [zlib attr];
preBuild = ''
cd squashfs-tools

4
pkgs/tools/graphics/pngcrush/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libpng, xz }:
{ stdenv, fetchurl, libpng }:
stdenv.mkDerivation rec {
name = "pngcrush-1.7.17";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sed -i s,/usr,$out, Makefile
'';
buildInputs = [ xz libpng ];
buildInputs = [ libpng ];
meta = {
homepage = http://pmt.sourceforge.net/pngcrush;

3
pkgs/tools/misc/coreutils/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, fetchurl, perl, gmp ? null
, aclSupport ? false, acl ? null
, selinuxSupport? false, libselinux ? null, libsepol ? null
, xz
}:
assert aclSupport -> acl != null;
@ -15,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "176lgw810xw84c6fz5xwhydxggkndmzggl0pxqzldbjf85vv6zl3";
};
buildNativeInputs = [ perl xz ];
buildNativeInputs = [ perl ];
buildInputs = [ gmp ]
++ stdenv.lib.optional aclSupport acl
++ stdenv.lib.optional selinuxSupport libselinux

4
pkgs/tools/misc/grub/1.9x.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, xz, flex, bison, gettext, ncurses, libusb, freetype, qemu
{ fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu
, EFIsupport ? false }:
let
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "06q2a7bg1mbsms604a89fkdnwrc1jg9hr2mmfdmg3il39j6i827k";
};
buildNativeInputs = [ xz flex bison ];
buildNativeInputs = [ flex bison ];
buildInputs = [ ncurses libusb freetype gettext ]
++ stdenv.lib.optional doCheck qemu;

3
pkgs/tools/misc/parted/2.3.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline
, utillinux, xz, enableStatic ? false, hurd ? null }:
, utillinux, enableStatic ? false, hurd ? null }:
stdenv.mkDerivation rec {
name = "parted-2.3";
@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "0sabj81nawcjm8ww34lxg65ka8crv3w2ab4crh8ypw5agg681836";
};
buildNativeInputs = [ xz ];
buildInputs = [ libuuid ]
++ stdenv.lib.optional (readline != null) readline
++ stdenv.lib.optional (gettext != null) gettext

3
pkgs/tools/misc/parted/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline
, utillinux, xz, check, enableStatic ? false, hurd ? null }:
, utillinux, check, enableStatic ? false, hurd ? null }:
stdenv.mkDerivation rec {
name = "parted-3.0";
@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "054ybvjkj1mbm4mpn1rl12jzhvqg37b0xwwr4ly1zisvzrjhi11a";
};
buildNativeInputs = [ xz ];
buildInputs = [ libuuid ]
++ stdenv.lib.optional (readline != null) readline
++ stdenv.lib.optional (gettext != null) gettext

4
pkgs/tools/misc/system-config-printer/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto
, makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl
, pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups
, xz, pythonPackages
, pythonPackages
, withGUI ? true
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ xz intltool pkgconfig glib udev libusb cups xmlto
[ intltool pkgconfig glib udev libusb cups xmlto
libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils
pythonPackages.python pythonPackages.wrapPython
];

2
pkgs/tools/networking/lftp/default.nix
View File

@ -8,5 +8,5 @@ stdenv.mkDerivation rec {
sha256 = "0v3591fknmimarzk5icm0qxdcfzfckwi2drh165vsiggmj590iyx";
};
buildInputs = [gnutls libtasn1 pkgconfig readline zlib xz];
buildInputs = [gnutls libtasn1 pkgconfig readline zlib];
}

4
pkgs/tools/networking/modemmanager/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl_gnome, udev, polkit, dbus_glib, ppp, intltool, pkgconfig, xz }:
{ stdenv, fetchurl_gnome, udev, polkit, dbus_glib, ppp, intltool, pkgconfig }:
stdenv.mkDerivation rec {
name = src.pkgname;
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0zvwrni4l21d856nq28khigrhwgrq5cc7nh45zidwjj8q7bsxiz7";
};
buildNativeInputs = [ xz intltool pkgconfig ];
buildNativeInputs = [ intltool pkgconfig ];
buildInputs = [ udev polkit dbus_glib ppp ];

4
pkgs/tools/networking/network-manager-applet/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, glib, libglade
, networkmanager, GConf, libnotify, gnome_keyring, dbus_glib
, polkit, xz }:
, polkit }:
let
pn = "network-manager-applet";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk libglade networkmanager GConf libnotify gnome_keyring
polkit];
buildNativeInputs = [ intltool pkgconfig xz ];
buildNativeInputs = [ intltool pkgconfig ];
meta = with stdenv.lib; {
homepage = http://projects.gnome.org/NetworkManager/;

4
pkgs/tools/networking/network-manager/pptp.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, networkmanager, pptp, ppp, xz, intltool, pkgconfig }:
{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig }:
let
pn = "networkmanager-pptp";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ networkmanager pptp ppp ];
buildNativeInputs = [ xz intltool pkgconfig ];
buildNativeInputs = [ intltool pkgconfig ];
configureFlags = "--without-gnome --disable-nls";
}

4
pkgs/tools/package-management/rpm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cpio, zlib, bzip2, xz, file, elfutils, nspr, nss, popt, db4 }:
{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4 }:
stdenv.mkDerivation rec {
name = "rpm-4.7.2";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0";
};
buildInputs = [ cpio zlib bzip2 xz file nspr nss popt db4 ];
buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 ];
# Note: we don't add elfutils to buildInputs, since it provides a
# bad `ld' and other stuff.

4
pkgs/tools/text/gnugrep/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pcre, libiconv ? null, xz }:
{ stdenv, fetchurl, pcre, libiconv ? null }:
let version = "2.10"; in
@ -10,7 +10,7 @@ stdenv.mkDerivation ({
sha256 = "1cvsqyfzk1p38fcaav22dn76fkd02g7bjnqna6vrpk9vy9rnfybc";
};
buildInputs = [ pcre xz ]
buildInputs = [ pcre ]
++ (stdenv.lib.optional (libiconv != null) libiconv);
doCheck = if stdenv.isDarwin then false else true;

10
pkgs/top-level/all-packages.nix
View File

@ -6945,20 +6945,14 @@ let
i810switch = callPackage ../os-specific/linux/i810switch { };
icecat3 = lowPrio (import ../applications/networking/browsers/icecat-3 {
inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo
python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify
wirelesstools;
icecat3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 {
inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango;
inherit (xlibs) pixman;
inherit (pythonPackages) ply;
});
icecatXulrunner3 = lowPrio (import ../applications/networking/browsers/icecat-3 {
icecatXulrunner3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 {
application = "xulrunner";
inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo
python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify
wirelesstools;
inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango;
inherit (xlibs) pixman;
inherit (pythonPackages) ply;