diff options
| author | Graham Christensen <graham@grahamc.com> | 2020-11-24 10:29:28 -0500 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2020-11-24 12:42:06 -0500 |
| commit | bc49a0815ae860010b4d593b02f00ab6f07d50ea (patch) | |
| tree | 1435af86f0f2172632621a400f27a44599751f17 /pkgs/os-specific/linux/systemd | |
| parent | 79086e5d55e037b994c839c2894a3667ae72547b (diff) | |
| download | nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.gz nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.bz2 nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.lz nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.xz nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.zst nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.zip | |
utillinux: rename to util-linux
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 85c78ce1421..13b52b86ff4 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -18,7 +18,7 @@ # Mandatory dependencies , libcap -, utillinux +, util-linux , kbd , kmod @@ -277,9 +277,9 @@ stdenv.mkDerivation { "-Dkill-path=${coreutils}/bin/kill" "-Dkmod-path=${kmod}/bin/kmod" - "-Dsulogin-path=${utillinux}/bin/sulogin" - "-Dmount-path=${utillinux}/bin/mount" - "-Dumount-path=${utillinux}/bin/umount" + "-Dsulogin-path=${util-linux}/bin/sulogin" + "-Dmount-path=${util-linux}/bin/mount" + "-Dumount-path=${util-linux}/bin/umount" "-Dcreate-log-dirs=false" # Upstream uses cgroupsv2 by default. To support docker and other # container managers we still need v1. @@ -326,12 +326,12 @@ stdenv.mkDerivation { test -e $i substituteInPlace $i \ --replace /usr/bin/getent ${getent}/bin/getent \ - --replace /sbin/mkswap ${lib.getBin utillinux}/sbin/mkswap \ - --replace /sbin/swapon ${lib.getBin utillinux}/sbin/swapon \ - --replace /sbin/swapoff ${lib.getBin utillinux}/sbin/swapoff \ + --replace /sbin/mkswap ${lib.getBin util-linux}/sbin/mkswap \ + --replace /sbin/swapon ${lib.getBin util-linux}/sbin/swapon \ + --replace /sbin/swapoff ${lib.getBin util-linux}/sbin/swapoff \ --replace /bin/echo ${coreutils}/bin/echo \ --replace /bin/cat ${coreutils}/bin/cat \ - --replace /sbin/sulogin ${lib.getBin utillinux}/sbin/sulogin \ + --replace /sbin/sulogin ${lib.getBin util-linux}/sbin/sulogin \ --replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \ --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \ --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency |