mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 12:11:28 +00:00
Code Issues Wiki Activity

systemd: cosmetic rewording of code

Browse source
This commit is contained in:
Anderson Torres 2023-11-24 07:58:48 -03:00
parent bc563998c0
commit d91b8d9fcb
1 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
pkgs/os-specific/linux/systemd/default.nix
View file

@ -146,14 +146,14 @@
, docbook_xml_dtd_45 , docbook_xml_dtd_45
}: }:
assert withImportd -> withCompression; assert withBootloader -> withEfi;
assert withCoredump -> withCompression; assert withCoredump -> withCompression;
assert withHomed -> withCryptsetup; assert withHomed -> withCryptsetup;
assert withHomed -> withPam; assert withHomed -> withPam;
assert withUkify -> withEfi; assert withImportd -> withCompression;
assert withRepart -> withCryptsetup; assert withRepart -> withCryptsetup;
assert withBootloader -> withEfi; assert withUkify -> withEfi;
# passwdqc is not packaged in nixpkgs yet, if you want to fix this, please submit a PR. # passwdqc is not in nixpkgs yet. Feel free to please submit a PR.
assert !withPasswordQuality; assert !withPasswordQuality;
let let
@ -582,17 +582,29 @@ stdenv.mkDerivation (finalAttrs: {
# must be exhaustive. If another (unhandled) case is found in the source # must be exhaustive. If another (unhandled) case is found in the source
# code the build fails with an error message. # code the build fails with an error message.
binaryReplacements = [ binaryReplacements = [
{ search = "/usr/bin/getent"; replacement = "${getent}/bin/getent"; where = [ "src/nspawn/nspawn-setuid.c" ]; } {
search = "/usr/bin/getent";
replacement = "${getent}/bin/getent";
where = [ "src/nspawn/nspawn-setuid.c" ];
}
{ {
search = "/sbin/mkswap"; search = "/sbin/mkswap";
replacement = "${lib.getBin util-linux}/sbin/mkswap"; replacement = "${lib.getBin util-linux}/sbin/mkswap";
where = [ "man/systemd-makefs@.service.xml" ];
}
{
search = "/sbin/swapon";
replacement = "${lib.getOutput "swap" util-linux}/sbin/swapon";
where = [ where = [
"man/systemd-makefs@.service.xml" "src/core/swap.c"
"src/basic/unit-def.h"
]; ];
} }
{ search = "/sbin/swapon"; replacement = "${lib.getOutput "swap" util-linux}/sbin/swapon"; where = [ "src/core/swap.c" "src/basic/unit-def.h" ]; } {
{ search = "/sbin/swapoff"; replacement = "${lib.getOutput "swap" util-linux}/sbin/swapoff"; where = [ "src/core/swap.c" ]; } search = "/sbin/swapoff";
replacement = "${lib.getOutput "swap" util-linux}/sbin/swapoff";
where = [ "src/core/swap.c" ];
}
{ {
search = "/bin/echo"; search = "/bin/echo";
replacement = "${coreutils}/bin/echo"; replacement = "${coreutils}/bin/echo";
@ -609,14 +621,15 @@ stdenv.mkDerivation (finalAttrs: {
{ {
search = "/bin/cat"; search = "/bin/cat";
replacement = "${coreutils}/bin/cat"; replacement = "${coreutils}/bin/cat";
where = [ "test/test-execute/exec-noexecpaths-simple.service" "src/journal/cat.c" ]; where = [
"test/test-execute/exec-noexecpaths-simple.service"
"src/journal/cat.c"
];
} }
{ {
search = "/usr/lib/systemd/systemd-fsck"; search = "/usr/lib/systemd/systemd-fsck";
replacement = "$out/lib/systemd/systemd-fsck"; replacement = "$out/lib/systemd/systemd-fsck";
where = [ where = [ "man/systemd-fsck@.service.xml" ];
"man/systemd-fsck@.service.xml"
];
} }
] ++ lib.optionals withImportd [ ] ++ lib.optionals withImportd [
{ {