Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: utillinux -> util-linux

Browse source
This commit is contained in:
Infinidoge 2022-10-05 16:08:57 -04:00
parent f323ad2752
commit 2af54e28fe
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/global/packages.nix
View file

@ -43,7 +43,7 @@
unixtools.whereis unixtools.whereis
unzip unzip
usbutils usbutils
utillinux util-linux
vim vim
wget wget
whois whois

4
users/modules/bindmounts.nix
View file

@ -125,7 +125,7 @@ in
Service = { Service = {
ExecStart = "${startScript}"; ExecStart = "${startScript}";
ExecStop = "${stopScript}"; ExecStop = "${stopScript}";
Environment = "PATH=${makeBinPath [ pkgs.coreutils pkgs.utillinux pkgs.gnugrep pkgs.bindfs ]}:/run/wrappers/bin"; Environment = "PATH=${makeBinPath [ pkgs.coreutils pkgs.util-linux pkgs.gnugrep pkgs.bindfs ]}:/run/wrappers/bin";
}; };
}; };
}; };
@ -159,7 +159,7 @@ in
inherit (dir) source target; inherit (dir) source target;
targetDir = escapeShellArg (concatPaths [ persistentStoragePath source ]); targetDir = escapeShellArg (concatPaths [ persistentStoragePath source ]);
mountPoint = escapeShellArg (concatPaths [ config.home.homeDirectory target ]); mountPoint = escapeShellArg (concatPaths [ config.home.homeDirectory target ]);
mount = "${pkgs.utillinux}/bin/mount"; mount = "${pkgs.util-linux}/bin/mount";
bindfsOptions = concatStringsSep "," ( bindfsOptions = concatStringsSep "," (
optional (!cfg.${persistentStoragePath}.allowOther) "no-allow-other" optional (!cfg.${persistentStoragePath}.allowOther) "no-allow-other"
++ optional (versionAtLeast pkgs.bindfs.version "1.14.9") "fsname=${targetDir}" ++ optional (versionAtLeast pkgs.bindfs.version "1.14.9") "fsname=${targetDir}"