alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #179796 from klemensn/desktop-manager-literal-newline

Browse source 
nixos/desktop-manager: Use literal newline to fix shell syntax
This commit is contained in:
Silvan Mosberger 2022-07-01 20:32:00 +02:00 committed by GitHub
parent 0669fd6f20 987400b848
commit 9b68a413da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/x11/desktop-managers/default.nix
View file

@ -72,7 +72,9 @@ in
apply = map (d: d // {
manage = "desktop";
start = d.start
+ optionalString (needBGCond d) ''\n\n
# literal newline to ensure d.start's last line is not appended to
+ optionalString (needBGCond d) ''
if [ -e $HOME/.background-image ]; then
${pkgs.feh}/bin/feh --bg-${cfg.wallpaper.mode} ${optionalString cfg.wallpaper.combineScreens "--no-xinerama"} $HOME/.background-image
fi