summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hel.nix29
1 files changed, 13 insertions, 16 deletions
diff --git a/hel.nix b/hel.nix
index 6497a11f..e02f9bf4 100644
--- a/hel.nix
+++ b/hel.nix
@@ -89,24 +89,21 @@
89 modprobe wacom 89 modprobe wacom
90 ''; 90 '';
91 91
92 # samsung-unified-linux-driver = pkgs.stdenv.lib.overrideDerivation pkgs.samsung-unified-linux-driver (oldAttrs: { 92 samsung-unified-linux-drives = pkgs.stdenv.lib.overrideDerivation pkgs.samsung-unified-linux-driver (oldAttrs: {
93 # buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; 93 buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
94 # builder = pkgs.writeScript "builder.sh" '' 94 builder = pkgs.writeScript "builder.sh" ''
95 # #!${pkgs.stdenv.shell} 95 #!${pkgs.stdenv.shell}
96 96
97 # source ${pkgs.stdenv}/setup 97 source ${pkgs.stdenv}/setup
98 98
99 # ${oldAttrs.builder} ${pkgs.lib.concatStringsSep " " oldAttrs.args} 99 ${oldAttrs.builder} ${pkgs.lib.concatStringsSep " " oldAttrs.args}
100 100
101 # export PATH=${pkgs.makeWrapper}/bin:$PATH 101 export PATH=${pkgs.makeWrapper}/bin:$PATH
102 102
103 # echo "Wrapping samsung filters" 103 mkdir -p $out/lib/sane
104 # wrapProgram $out/lib/cups/filter/rastertosamsungspl \ 104 install -Dm755 at_root/usr/lib64/sane/libsane-smfp.so.1.0.1 $out/lib/sane
105 # --prefix PATH : ${pkgs.ghostscript}/bin 105 '';
106 # wrapProgram $out/lib/cups/filter/rastertosamsungsplc \ 106 });
107 # --prefix PATH : ${pkgs.ghostscript}/bin
108 # '';
109 # });
110 107
111 libfprint = pkgs.stdenv.mkDerivation rec { 108 libfprint = pkgs.stdenv.mkDerivation rec {
112 name = "libfprint-${version}"; 109 name = "libfprint-${version}";
@@ -481,8 +478,8 @@
481 478
482 environment.etc."X11/xorg.conf.d/50-wacom.conf".source = lib.mkForce ./hel/wacom.conf; 479 environment.etc."X11/xorg.conf.d/50-wacom.conf".source = lib.mkForce ./hel/wacom.conf;
483 480
484 environment.etc."sane.d/dll.conf".text = "xerox_mfp"; 481 environment.etc."sane.d/dll.conf".text = "smfp";
485 environment.etc."sane.d/xerox_mfp.conf".text = "tcp printer.asgard.yggdrasil"; 482 environment.etc."sane.d/smfp.conf".text = "tcp printer.asgard.yggdrasil";
486 483
487 systemd.services."kill-user@" = { 484 systemd.services."kill-user@" = {
488 serviceConfig = { 485 serviceConfig = {