From 4a9fddc59863c3c2077e35bff913dd664c8b6e1a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 26 Mar 2018 22:37:49 -0500 Subject: unixtools: cleanup --- pkgs/os-specific/linux/autofs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/os-specific/linux/autofs') diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 79e12dd0f43..a7472de1d02 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, utillinux, nfs-utils, e2fsprogs +{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, modprobe, nfs-utils, e2fsprogs , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }: let @@ -17,10 +17,10 @@ in stdenv.mkDerivation { export sssldir="${sssd}/lib/sssd/modules" export HAVE_SSS_AUTOFS=1 - export MOUNT=${utillinux}/bin/mount + export MOUNT=${mount}/bin/mount export MOUNT_NFS=${nfs-utils}/bin/mount.nfs - export UMOUNT=${utillinux}/bin/umount - export MODPROBE=${utillinux}/bin/modprobe + export UMOUNT=${umount}/bin/umount + export MODPROBE=${modprobe}/bin/modprobe export E2FSCK=${e2fsprogs}/bin/fsck.ext2 export E3FSCK=${e2fsprogs}/bin/fsck.ext3 export E4FSCK=${e2fsprogs}/bin/fsck.ext4 -- cgit 1.4.1