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/networking | |
parent | c556a6ea46e71e1907d78b71fab36df30297b3ad (diff) | |
download | nixlib-d4d7931a6296cd72d3d5f360d628be86bb62246b.tar nixlib-d4d7931a6296cd72d3d5f360d628be86bb62246b.tar.gz nixlib-d4d7931a6296cd72d3d5f360d628be86bb62246b.tar.bz2 nixlib-d4d7931a6296cd72d3d5f360d628be86bb62246b.tar.lz nixlib-d4d7931a6296cd72d3d5f360d628be86bb62246b.tar.xz nixlib-d4d7931a6296cd72d3d5f360d628be86bb62246b.tar.zst nixlib-d4d7931a6296cd72d3d5f360d628be86bb62246b.zip |
* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/browsers/icecat-3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/opera/default.nix | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 7fc5ddbcce51..e916c34631e5 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 3dddc8569637..19a55c0f89cd 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 { |