diff options
| author | Linus Heckemann <git@sphalerite.org> | 2023-05-22 19:55:07 +0200 |
|---|---|---|
| committer | Linus Heckemann <git@sphalerite.org> | 2023-06-12 10:26:04 +0200 |
| commit | eb0b0131ceacce1b1d1cbecc1f27fd747a9b507e (patch) | |
| tree | 239f19ea702e242226488cf0e14c511b20a0f2c5 /pkgs/os-specific/linux/systemd/default.nix | |
| parent | 4e036dd92e90f04272208ff7d01330dc8582c0e8 (diff) | |
| download | nixpkgs-eb0b0131ceacce1b1d1cbecc1f27fd747a9b507e.tar nixpkgs-eb0b0131ceacce1b1d1cbecc1f27fd747a9b507e.tar.gz nixpkgs-eb0b0131ceacce1b1d1cbecc1f27fd747a9b507e.tar.bz2 nixpkgs-eb0b0131ceacce1b1d1cbecc1f27fd747a9b507e.tar.lz nixpkgs-eb0b0131ceacce1b1d1cbecc1f27fd747a9b507e.tar.xz nixpkgs-eb0b0131ceacce1b1d1cbecc1f27fd747a9b507e.tar.zst nixpkgs-eb0b0131ceacce1b1d1cbecc1f27fd747a9b507e.zip | |
util-linux: split mount, login and swap utils into their own outputs
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index fd5ca2df5a9..fada9f6ab4a 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -508,9 +508,10 @@ stdenv.mkDerivation (finalAttrs: { "-Dsysvinit-path=" "-Dsysvrcnd-path=" - "-Dsulogin-path=${util-linux}/bin/sulogin" - "-Dmount-path=${util-linux}/bin/mount" - "-Dumount-path=${util-linux}/bin/umount" + "-Dsulogin-path=${util-linux.login}/bin/sulogin" + "-Dnologin-path=${util-linux.login}/bin/nologin" + "-Dmount-path=${util-linux.mount}/bin/mount" + "-Dumount-path=${util-linux.mount}/bin/umount" "-Dcreate-log-dirs=false" # Use cgroupsv2. This is already the upstream default, but better be explicit. @@ -561,8 +562,8 @@ stdenv.mkDerivation (finalAttrs: { "man/systemd-makefs@.service.xml" ]; } - { search = "/sbin/swapon"; replacement = "${lib.getBin util-linux}/sbin/swapon"; where = [ "src/core/swap.c" "src/basic/unit-def.h" ]; } - { search = "/sbin/swapoff"; replacement = "${lib.getBin util-linux}/sbin/swapoff"; where = [ "src/core/swap.c" ]; } + { search = "/sbin/swapon"; replacement = "${util-linux.swap}/sbin/swapon"; where = [ "src/core/swap.c" "src/basic/unit-def.h" ]; } + { search = "/sbin/swapoff"; replacement = "${util-linux.swap}/sbin/swapoff"; where = [ "src/core/swap.c" ]; } { search = "/bin/echo"; replacement = "${coreutils}/bin/echo"; |