From d9e165e9af42812e0a5f7a21733990a79c0e99d5 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 23 Mar 2025 21:58:08 +0300 Subject: [PATCH] Revert "nixos/xrdp: use --replace-fail with substituteInPlace" --- nixos/modules/services/networking/xrdp.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index 78dc280365c14..0168bfb5de519 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -20,17 +20,17 @@ let chmod +x $out/startwm.sh substituteInPlace $out/xrdp.ini \ - --replace-fail "#rsakeys_ini=" "rsakeys_ini=/run/xrdp/rsakeys.ini" \ - --replace-fail "certificate=" "certificate=${cfg.sslCert}" \ - --replace-fail "key_file=" "key_file=${cfg.sslKey}" \ - --replace-fail LogFile=xrdp.log LogFile=/dev/null \ - --replace-fail EnableSyslog=true EnableSyslog=false + --replace "#rsakeys_ini=" "rsakeys_ini=/run/xrdp/rsakeys.ini" \ + --replace "certificate=" "certificate=${cfg.sslCert}" \ + --replace "key_file=" "key_file=${cfg.sslKey}" \ + --replace LogFile=xrdp.log LogFile=/dev/null \ + --replace EnableSyslog=true EnableSyslog=false substituteInPlace $out/sesman.ini \ - --replace-fail LogFile=xrdp-sesman.log LogFile=/dev/null \ - --replace-fail EnableSyslog=1 EnableSyslog=0 \ - --replace-fail startwm.sh $out/startwm.sh \ - --replace-fail reconnectwm.sh $out/reconnectwm.sh \ + --replace LogFile=xrdp-sesman.log LogFile=/dev/null \ + --replace EnableSyslog=1 EnableSyslog=0 \ + --replace startwm.sh $out/startwm.sh \ + --replace reconnectwm.sh $out/reconnectwm.sh \ # Ensure that clipboard works for non-ASCII characters sed -i -e '/.*SessionVariables.*/ a\