* Forgot a few utillinuxng references.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30866
This commit is contained in:
Eelco Dolstra 2011-12-13 12:57:32 +00:00
parent 39c8bfdcc4
commit c044d7f56f
6 changed files with 15 additions and 15 deletions

View file

@ -351,7 +351,7 @@ rec {
with pkgs; runInLinuxVM ( with pkgs; runInLinuxVM (
stdenv.mkDerivation { stdenv.mkDerivation {
name = "extract-file"; name = "extract-file";
buildInputs = [utillinuxng]; buildInputs = [ utillinux ];
buildCommand = '' buildCommand = ''
ln -s ${linux}/lib /lib ln -s ${linux}/lib /lib
${module_init_tools}/sbin/modprobe loop ${module_init_tools}/sbin/modprobe loop
@ -376,7 +376,7 @@ rec {
with pkgs; runInLinuxVM ( with pkgs; runInLinuxVM (
stdenv.mkDerivation { stdenv.mkDerivation {
name = "extract-file-mtd"; name = "extract-file-mtd";
buildInputs = [utillinuxng mtdutils]; buildInputs = [ utillinux mtdutils ];
buildCommand = '' buildCommand = ''
ln -s ${linux}/lib /lib ln -s ${linux}/lib /lib
${module_init_tools}/sbin/modprobe mtd ${module_init_tools}/sbin/modprobe mtd

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, python, pciutils, expat { stdenv, fetchurl, pkgconfig, python, pciutils, expat
, libusb, dbus, dbus_glib, glib, libuuid, perl , libusb, dbus, dbus_glib, glib, libuuid, perl
, perlXMLParser, gettext, zlib, gperf, consolekit, policykit , perlXMLParser, gettext, zlib, gperf, consolekit, policykit
, libsmbios, dmidecode, udev, utillinuxng, pmutils, usbutils , libsmbios, dmidecode, udev, utillinux, pmutils, usbutils
, eject, upstart , eject, upstart
}: }:
@ -51,8 +51,8 @@ stdenv.mkDerivation rec {
substituteInPlace $i \ substituteInPlace $i \
${changeDmidecode} \ ${changeDmidecode} \
${if udev != null then "--replace /sbin/udevadm ${udev}/sbin/udevadm" else ""} \ ${if udev != null then "--replace /sbin/udevadm ${udev}/sbin/udevadm" else ""} \
--replace /bin/mount ${utillinuxng}/bin/mount \ --replace /bin/mount ${utillinux}/bin/mount \
--replace /bin/umount ${utillinuxng}/bin/umount \ --replace /bin/umount ${utillinux}/bin/umount \
--replace /usr/bin/pm-is-supported ${pmutils}/bin/pm-is-supported \ --replace /usr/bin/pm-is-supported ${pmutils}/bin/pm-is-supported \
--replace /usr/sbin/pm ${pmutils}/sbin/pm \ --replace /usr/sbin/pm ${pmutils}/sbin/pm \
--replace /sbin/shutdown ${upstart}/sbin/shutdown --replace /sbin/shutdown ${upstart}/sbin/shutdown

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, tcpWrapper, utillinuxng, libcap }: { fetchurl, stdenv, tcpWrapper, utillinux, libcap }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nfs-utils-1.2.3"; name = "nfs-utils-1.2.3";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
}; };
# Needs `libblkid' and `libcomerr' from `e2fsprogs' or `util-linux-ng'. # Needs `libblkid' and `libcomerr' from `e2fsprogs' or `util-linux-ng'.
buildInputs = [ tcpWrapper utillinuxng libcap ]; buildInputs = [ tcpWrapper utillinux libcap ];
# FIXME: Add the dependencies needed for NFSv4 and TI-RPC. # FIXME: Add the dependencies needed for NFSv4 and TI-RPC.
configureFlags = configureFlags =

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, cryptsetup, dbus, dbus_glib, hal, intltool, ntfs3g, utillinuxng { stdenv, fetchurl, cryptsetup, dbus, dbus_glib, hal, intltool, ntfs3g, utillinux
, mediaDir ? "/media/" , mediaDir ? "/media/"
, lockDir ? "/var/lock/pmount" , lockDir ? "/var/lock/pmount"
, whiteList ? "/etc/pmount.allow" , whiteList ? "/etc/pmount.allow"
@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036"; sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036";
}; };
buildInputs = [ hal intltool utillinuxng ]; buildInputs = [ hal intltool utillinux ];
configureFlags = "" configureFlags = ""
+ " --with-media-dir=${mediaDir}" + " --with-media-dir=${mediaDir}"
+ " --with-lock-dir=${lockDir}" + " --with-lock-dir=${lockDir}"
+ " --with-whitelist=${whiteList}" + " --with-whitelist=${whiteList}"
+ " --with-mount-prog=${utillinuxng}/bin/mount" + " --with-mount-prog=${utillinux}/bin/mount"
+ " --with-umount-prog=${utillinuxng}/bin/umount" + " --with-umount-prog=${utillinux}/bin/umount"
+ " --with-cryptsetup=${cryptsetup}/sbin/cryptsetup" + " --with-cryptsetup=${cryptsetup}/sbin/cryptsetup"
+ " --with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g" + " --with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g"
+ " --enable-hal"; + " --enable-hal";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline { stdenv, fetchurl, devicemapper, libuuid, gettext, readline
, utillinuxng, xz, enableStatic ? false, hurd ? null }: , utillinux, xz, enableStatic ? false, hurd ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "parted-2.3"; name = "parted-2.3";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
preCheck = preCheck =
stdenv.lib.optionalString doCheck stdenv.lib.optionalString doCheck
# The `t0400-loop-clobber-infloop.sh' test wants `mkswap'. # The `t0400-loop-clobber-infloop.sh' test wants `mkswap'.
"export PATH=\"${utillinuxng}/sbin:$PATH\""; "export PATH=\"${utillinux}/sbin:$PATH\"";
meta = { meta = {
description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions"; description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline { stdenv, fetchurl, devicemapper, libuuid, gettext, readline
, utillinuxng, xz, check, enableStatic ? false, hurd ? null }: , utillinux, xz, check, enableStatic ? false, hurd ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "parted-3.0"; name = "parted-3.0";
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
preCheck = preCheck =
stdenv.lib.optionalString doCheck stdenv.lib.optionalString doCheck
# The `t0400-loop-clobber-infloop.sh' test wants `mkswap'. # The `t0400-loop-clobber-infloop.sh' test wants `mkswap'.
"export PATH=\"${utillinuxng}/sbin:$PATH\""; "export PATH=\"${utillinux}/sbin:$PATH\"";
meta = { meta = {
description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions"; description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions";