summaryrefslogtreecommitdiffstats
path: root/makefu/3modules
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-09-26 15:36:25 +0200
committerlassulus <lassulus@lassul.us>2022-09-26 15:36:25 +0200
commit059a5b48af9f6c21c3c442bb0fc35d2105d3b682 (patch)
tree15de5c35d213d677bc2b294fc411d0f43dc536b2 /makefu/3modules
parent4d7aacdd1c2a8cc9f6d826cb7e3bb2bc10e36a5e (diff)
parent5b9d7e47c3f1877bcffdf2aafac712451db43d61 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/3modules')
-rw-r--r--makefu/3modules/ps3netsrv.nix2
-rw-r--r--makefu/3modules/sane-extra.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/makefu/3modules/ps3netsrv.nix b/makefu/3modules/ps3netsrv.nix
index bb2abd9a5..a0a6eb1f4 100644
--- a/makefu/3modules/ps3netsrv.nix
+++ b/makefu/3modules/ps3netsrv.nix
@@ -41,7 +41,7 @@ let
};
serviceConfig = {
Type = "simple";
- ExecStart = "${cfg.package}/bin/ps3netsrv++ ${shell.escape cfg.servedir}";
+ ExecStart = "${cfg.package}/bin/ps3netsrv ${shell.escape cfg.servedir}";
PrivateTmp = true;
User = "${cfg.user}";
};
diff --git a/makefu/3modules/sane-extra.nix b/makefu/3modules/sane-extra.nix
index 2e0ce8f2f..8cbed572c 100644
--- a/makefu/3modules/sane-extra.nix
+++ b/makefu/3modules/sane-extra.nix
@@ -22,7 +22,7 @@ let
${concatMapStrings (c: ''
f="$out/${c.name}.conf"
[ ! -e "$f" ] || chmod +w "$f"
- cat ${builtins.toFile "" (c.value + "\n")} >>"$f"
+ cat ${builtins.toFile "outfile" (c.value + "\n")} >>"$f"
chmod -w "$f"
'') (mapAttrsToList nameValuePair cfg.extraConfig)}
chmod -w $out