From 24c665021d376c5ee045c4e4c7ca26fed5a1b7cb Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 5 Oct 2018 19:36:08 +0200 Subject: ... --- hel.nix | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/hel.nix b/hel.nix index a2fb8f2b..fdf97567 100644 --- a/hel.nix +++ b/hel.nix @@ -87,27 +87,24 @@ 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-driver = 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 - chmod +x $out/lib/cups/filter/rastertosamsungspl - chmod +x $out/lib/cups/filter/rastertosamsungsplc - - 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 - ''; - }); + # 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 + # ''; + # }); libfprint = pkgs.stdenv.mkDerivation rec { name = "libfprint-${version}"; -- cgit v1.2.3