git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/hylafax: use `runtimeShell` where possible

According to https://github.com/NixOS/nixpkgs/pull/84556 this effort helps with cross-compilation. This commit also renames a substituted variable `hylafax` to `hylafaxplus` to permit substitution with `inherit`.

commit4415846d5cbb0e1128f2042288037b85b231219e authorYarny0 <41838844+Yarny0@users.noreply.github.com> dateSat 8 May 2021, 21:34 (6 years ago) parent89df33f
3 files changed+6−7
nixos/modules/services/networking/hylafax/faxq-wait.sh+1−1 nixos/modules/services/networking/hylafax/spool.sh+3−3 nixos/modules/services/networking/hylafax/systemd.nix+2−3
nixos/modules/services/networking/hylafax/faxq-wait.sh+1−1
@@ -1,4 +1,4 @@
1−#! @shell@ -e
1+#! @runtimeShell@ -e
22
33# skip this if there are no modems at all
44if ! stat -t "@spoolAreaPath@"/etc/config.* >/dev/null 2>&1
nixos/modules/services/networking/hylafax/spool.sh+3−3
@@ -1,4 +1,4 @@
1−#! @shell@ -e
1+#! @runtimeShell@ -e
22
33# The following lines create/update the HylaFAX spool directory:
44# Subdirectories/files with persistent data are kept,
@@ -80,7 +80,7 @@ touch clientlog faxcron.lastrun xferfaxlog
8080chown @faxuser@:@faxgroup@ clientlog faxcron.lastrun xferfaxlog
8181
8282# create symlinks for frozen directories/files
83−lnsym --target-directory=. "@hylafax@"/spool/{COPYRIGHT,bin,config}
83+lnsym --target-directory=. "@hylafaxplus@"/spool/{COPYRIGHT,bin,config}
8484
8585# create empty temporary directories
8686update --mode=0700 -d client dev status
@@ -93,7 +93,7 @@ install -d "@spoolAreaPath@/etc"
9393cd "@spoolAreaPath@/etc"
9494
9595# create symlinks to all files in template's etc
96−lnsym --target-directory=. "@hylafax@/spool/etc"/*
96+lnsym --target-directory=. "@hylafaxplus@/spool/etc"/*
9797
9898# set LOCKDIR in setup.cache
9999sed --regexp-extended 's|^(UUCP_LOCKDIR=).*$|\1'"'@lockPath@'|g" --in-place setup.cache
nixos/modules/services/networking/hylafax/systemd.nix+2−3
@@ -47,13 +47,12 @@ let
4747 name = "hylafax-setup-spool.sh";
4848 src = ./spool.sh;
4949 isExecutable = true;
50− inherit (pkgs.stdenv) shell;
51− hylafax = pkgs.hylafaxplus;
5250 faxuser = "uucp";
5351 faxgroup = "uucp";
5452 lockPath = "/var/lock";
5553 inherit globalConfigPath modemConfigPath;
5654 inherit (cfg) sendmailPath spoolAreaPath userAccessFile;
55+ inherit (pkgs) hylafaxplus runtimeShell;
5756 };
5857
5958 waitFaxqScript = pkgs.substituteAll {
@@ -63,8 +62,8 @@ let
6362 src = ./faxq-wait.sh;
6463 isExecutable = true;
6564 timeoutSec = toString 10;
66− inherit (pkgs.stdenv) shell;
6765 inherit (cfg) spoolAreaPath;
66+ inherit (pkgs) runtimeShell;
6867 };
6968
7069 sockets.hylafax-hfaxd = {