Commit 455c195f authored by Yarny0's avatar Yarny0
Browse files

nixos/hylafax: use `getExe'` 

...for a few coreutils invocations.
parent 8378491d

nixos/modules/services/networking/hylafax/modem-default.nix

+3 −3
Original line number Diff line number Diff line 
{ pkgs, ... }:

{ pkgs, lib, ... }:



# see man:hylafax-config(5)
@@ -16,7 +16,7 @@ 
  SessionTracing = "0x78701";

  UUCPLockDir = "/var/lock";



  SendPageCmd = "${pkgs.coreutils}/bin/false"; # prevent pager transmit

  SendUUCPCmd = "${pkgs.coreutils}/bin/false"; # prevent UUCP transmit

  SendPageCmd = lib.getExe' pkgs.coreutils "false"; # prevent pager transmit

  SendUUCPCmd = lib.getExe' pkgs.coreutils "false"; # prevent UUCP transmit



}

nixos/modules/services/networking/hylafax/options.nix

+3 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
let



  inherit (lib)

    getExe'

    literalExpression

    mkDefault

    mkEnableOption
@@ -110,11 +111,11 @@ let 
      # Otherwise, we use `false` to provoke

      # an error if hylafax tries to use it.

      c.sendmailPath = mkMerge [

        (mkIfDefault noWrapper "${pkgs.coreutils}/bin/false")

        (mkIfDefault noWrapper (getExe' pkgs.coreutils "false"))

        (mkIfDefault (!noWrapper) "${wrapperDir}/${program}")

      ];

      importDefaultConfig =

        file: lib.attrsets.mapAttrs (lib.trivial.const mkDefault) (import file { inherit pkgs; });

        file: lib.attrsets.mapAttrs (lib.trivial.const mkDefault) (import file { inherit lib pkgs; });

      c.commonModemConfig = importDefaultConfig ./modem-default.nix;

      c.faxqConfig = importDefaultConfig ./faxq-default.nix;

      c.hfaxdConfig = importDefaultConfig ./hfaxd-default.nix;