diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/misc/grub/1.9x.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/parted/2.3.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/misc/parted/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/misc/system-config-printer/default.nix | 4 |
5 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 7a69f01dad2fa..597ab802d74e2 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -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 diff --git a/pkgs/tools/misc/grub/1.9x.nix b/pkgs/tools/misc/grub/1.9x.nix index 14a4932f10034..49cc4884e6365 100644 --- a/pkgs/tools/misc/grub/1.9x.nix +++ b/pkgs/tools/misc/grub/1.9x.nix @@ -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; diff --git a/pkgs/tools/misc/parted/2.3.nix b/pkgs/tools/misc/parted/2.3.nix index 52b3c4b4dcf0c..649def691155e 100644 --- a/pkgs/tools/misc/parted/2.3.nix +++ b/pkgs/tools/misc/parted/2.3.nix @@ -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 diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 80abefc97ad0e..3d217d2660c57 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -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 diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index a7a08f291872f..8923637bbdbf7 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -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 ]; |