diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-18 20:53:01 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-18 20:53:01 +0000 |
commit | d4d7931a6296cd72d3d5f360d628be86bb62246b (patch) | |
tree | 68eb2786a890891d662884e90581b187ab7ee2bc /pkgs/applications | |
parent | c556a6ea46e71e1907d78b71fab36df30297b3ad (diff) |
* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
Diffstat (limited to 'pkgs/applications')
10 files changed, 14 insertions, 19 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index a4bd960655cd4..0b62ffdca5af1 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -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 diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index f9579336d2cd9..f0c666b14ea0d 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -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"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index b8100fbd70937..9ee87fe306256 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { inherit python; - buildNativeInputs = [ makeWrapper xz pkgconfig ]; + buildNativeInputs = [ makeWrapper pkgconfig ]; buildInputs = [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index faddeb70e998a..27ac0b7bd6a87 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -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 = '' diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 7fc5ddbcce51e..e916c34631e5a 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -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 diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 3dddc8569637e..19a55c0f89cd7 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -15,8 +15,6 @@ in stdenv.mkDerivation rec { name = "opera-11.51-1087"; - buildNativeInputs = [ xz ]; - src = if stdenv.system == "i686-linux" then fetchurl { diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index e1bf95700c9b4..ddffc6ee34b20 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -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" ]; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 4775a419fd146..42650b3afb30e 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -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 diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 092f5270b783e..14fdfdc4660fc 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -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 diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index b44f6d9f3aa8c..5110e42fb1831 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -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 ]; |