home

commit 00ccf05cf771c59e99ef88370aeb64f788425356
parent 0a3a16d741fa2295393224e45df6d6b6fa64bef9
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Wed, 24 Nov 2021 17:12:55 +0100

systems: temporarily disable sane.ExtraConfig

For some reason, it fails with nix 2.4.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
systems/modules/hardware/sane-extra-config.nixos.nix
 | 
36
++++++++++++++++++------------------

1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/systems/modules/hardware/sane-extra-config.nixos.nix b/systems/modules/hardware/sane-extra-config.nixos.nix
@@ -9,23 +9,23 @@ let
     else pkgs.sane-backends;
   backends = [ pkg ] ++ cfg.extraBackends;
   saneConfig = pkgs.mkSaneConfig { paths = backends; };
-  saneExtraConfig =
-    pkgs.runCommand "sane-extra-config"
-      { } ''
-      cp -Lr '${pkgs.mkSaneConfig { paths = [ pkgs.sane-backends ]; }}'/etc/sane.d $out
-      chmod +w $out
-      ${concatMapStrings
-        (
-        c: ''
-          f="$out/${c.name}.conf"
-          [ ! -e "$f" ] || chmod +w "$f"
-          cat ${builtins.toFile "" (c.value + "\n")} >>"$f"
-          chmod -w "$f"
-        ''
-        )
-        (mapAttrsToList nameValuePair cfg.extraConfig)}
-      chmod -w $out
-    '';
+  # saneExtraConfig =
+  #   pkgs.runCommand "sane-extra-config"
+  #     { } ''
+  #     cp -Lr '${pkgs.mkSaneConfig { paths = [ pkgs.sane-backends ]; }}'/etc/sane.d $out
+  #     chmod +w $out
+  #     ${concatMapStrings
+  #       (
+  #       c: ''
+  #         f="$out/${c.name}.conf"
+  #         [ ! -e "$f" ] || chmod +w "$f"
+  #         cat ${builtins.toFile "" (c.value + "\n")} >>"$f"
+  #         chmod -w "$f"
+  #       ''
+  #       )
+  #       (mapAttrsToList nameValuePair cfg.extraConfig)}
+  #     chmod -w $out
+  #   '';
 in
 {
   options = {
@@ -37,6 +37,6 @@ in
   };
 
   config = mkIf (cfg.enable && cfg.extraConfig != { }) {
-    hardware.sane.configDir = saneExtraConfig.outPath;
+    # hardware.sane.configDir = saneExtraConfig.outPath;
   };
 }