From f235431ee19d8d79e8f21157e54ffd444a26e4e5 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 14 Jul 2019 12:15:36 +0200 Subject: ... --- hel.nix | 29 +++++++++++++---------------- 1 file 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 @@ modprobe wacom ''; - # samsung-unified-linux-driver = pkgs.stdenv.lib.overrideDerivation pkgs.samsung-unified-linux-driver (oldAttrs: { - # buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; - # builder = pkgs.writeScript "builder.sh" '' - # #!${pkgs.stdenv.shell} + samsung-unified-linux-drives = pkgs.stdenv.lib.overrideDerivation pkgs.samsung-unified-linux-driver (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + builder = pkgs.writeScript "builder.sh" '' + #!${pkgs.stdenv.shell} - # source ${pkgs.stdenv}/setup + source ${pkgs.stdenv}/setup - # ${oldAttrs.builder} ${pkgs.lib.concatStringsSep " " oldAttrs.args} + ${oldAttrs.builder} ${pkgs.lib.concatStringsSep " " oldAttrs.args} - # export PATH=${pkgs.makeWrapper}/bin:$PATH + export PATH=${pkgs.makeWrapper}/bin:$PATH - # echo "Wrapping samsung filters" - # wrapProgram $out/lib/cups/filter/rastertosamsungspl \ - # --prefix PATH : ${pkgs.ghostscript}/bin - # wrapProgram $out/lib/cups/filter/rastertosamsungsplc \ - # --prefix PATH : ${pkgs.ghostscript}/bin - # ''; - # }); + mkdir -p $out/lib/sane + install -Dm755 at_root/usr/lib64/sane/libsane-smfp.so.1.0.1 $out/lib/sane + ''; + }); libfprint = pkgs.stdenv.mkDerivation rec { name = "libfprint-${version}"; @@ -481,8 +478,8 @@ environment.etc."X11/xorg.conf.d/50-wacom.conf".source = lib.mkForce ./hel/wacom.conf; - environment.etc."sane.d/dll.conf".text = "xerox_mfp"; - environment.etc."sane.d/xerox_mfp.conf".text = "tcp printer.asgard.yggdrasil"; + environment.etc."sane.d/dll.conf".text = "smfp"; + environment.etc."sane.d/smfp.conf".text = "tcp printer.asgard.yggdrasil"; systemd.services."kill-user@" = { serviceConfig = { -- cgit v1.2.3