diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2023-11-02 01:26:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-02 01:26:35 -0400 |
| commit | 9fe9de9762d5390b438bbfff942a100c401a68a3 (patch) | |
| tree | 7fa1a90d36ea0af6fe1375dd8add315397039551 /nixos | |
| parent | 3919f9de265b354aa9dc92316dce8ad75b89140a (diff) | |
| parent | 6c7ad5e732428a4e8063144312d77544a867e08c (diff) | |
Merge pull request #264811 from emilylange/systemd-empty-unit-build
nixos/systemd-lib: fix building of empty unit files
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/systemd-lib.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index fc95ab01289f0..7b600464bb415 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -20,7 +20,10 @@ in rec { pkgs.runCommand "unit-${mkPathSafeName name}" { preferLocalBuild = true; allowSubstitutes = false; - inherit (unit) text; + # unit.text can be null. But variables that are null listed in + # passAsFile are ignored by nix, resulting in no file being created, + # making the mv operation fail. + text = optionalString (unit.text != null) unit.text; passAsFile = [ "text" ]; } '' |