dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

autofs: Some cleanup

Browse Source 
The --with-openldap and --with-sasl flags passed here are actually wrong
as they don't point to the dev outputs of the packages. Anyway, autoconf
recognizes the packages as they are in buildInputs.

getBin is generally not needed - binaries can always be referred as
${foo}/bin/bar regardless of whether the package is multiple-output.

meta.version is unnecessary.
This commit is contained in:
Tuomas Tynkkynen 2017-02-09 02:50:48 +02:00
parent 3e7dffd2b3
commit 05605b41d8
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/os-specific/linux/autofs/default.nix
View File

@ -13,17 +13,17 @@ in stdenv.mkDerivation {
}; };
preConfigure = '' preConfigure = ''
configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH --with-openldap=${openldap} --with-sasl=${cyrus_sasl}" configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH"
export sssldir="${sssd}/lib/sssd/modules" export sssldir="${sssd}/lib/sssd/modules"
export HAVE_SSS_AUTOFS=1 export HAVE_SSS_AUTOFS=1
export MOUNT=${lib.getBin utillinux}/bin/mount export MOUNT=${utillinux}/bin/mount
export MOUNT_NFS=${lib.getBin nfs-utils}/bin/mount.nfs export MOUNT_NFS=${nfs-utils}/bin/mount.nfs
export UMOUNT=${lib.getBin utillinux}/bin/umount export UMOUNT=${utillinux}/bin/umount
export MODPROBE=${lib.getBin utillinux}/bin/modprobe export MODPROBE=${utillinux}/bin/modprobe
export E2FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext2 export E2FSCK=${e2fsprogs}/bin/fsck.ext2
export E3FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext3 export E3FSCK=${e2fsprogs}/bin/fsck.ext3
export E4FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext4 export E4FSCK=${e2fsprogs}/bin/fsck.ext4
''; '';
installPhase = '' installPhase = ''
@ -37,7 +37,6 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ flex bison ]; nativeBuildInputs = [ flex bison ];
meta = { meta = {
inherit version;
description = "Kernel-based automounter"; description = "Kernel-based automounter";
homepage = http://www.linux-consulting.com/Amd_AutoFS/autofs.html; homepage = http://www.linux-consulting.com/Amd_AutoFS/autofs.html;
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;