diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2023-06-28 14:23:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-28 14:23:45 -0400 |
| commit | 9e3415e8db78e4dbd62eedef9a5df3a04386c332 (patch) | |
| tree | 16f390ae3ae23221ef8ac3a2965f35841a916140 /pkgs/os-specific/linux/systemd | |
| parent | c5b82a046f98d23dfc11c2c2cc2da97c621f0df8 (diff) | |
| parent | eb0b0131ceacce1b1d1cbecc1f27fd747a9b507e (diff) | |
| download | nixpkgs-9e3415e8db78e4dbd62eedef9a5df3a04386c332.tar nixpkgs-9e3415e8db78e4dbd62eedef9a5df3a04386c332.tar.gz nixpkgs-9e3415e8db78e4dbd62eedef9a5df3a04386c332.tar.bz2 nixpkgs-9e3415e8db78e4dbd62eedef9a5df3a04386c332.tar.lz nixpkgs-9e3415e8db78e4dbd62eedef9a5df3a04386c332.tar.xz nixpkgs-9e3415e8db78e4dbd62eedef9a5df3a04386c332.tar.zst nixpkgs-9e3415e8db78e4dbd62eedef9a5df3a04386c332.zip | |
Merge pull request #236463 from DeterminateSystems/util-linux-split
util-linux: split mount, login and swap utils into their own outputs
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -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 ab64c9f9c48..53244a5a914 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -515,9 +515,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. @@ -568,8 +569,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"; |