* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
This commit is contained in:
@@ -8,5 +8,5 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0v3591fknmimarzk5icm0qxdcfzfckwi2drh165vsiggmj590iyx";
|
||||
};
|
||||
|
||||
buildInputs = [gnutls libtasn1 pkgconfig readline zlib xz];
|
||||
buildInputs = [gnutls libtasn1 pkgconfig readline zlib];
|
||||
}
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
@@ -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/;
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user