diff options
author | wucke13 <wucke13@gmail.com> | 2020-01-04 00:44:27 +0100 |
---|---|---|
committer | wucke13 <wucke13@gmail.com> | 2020-11-14 15:50:19 +0100 |
commit | f89b4dc45057343af8c625bd78738b0433a7f2b0 (patch) | |
tree | 65d4bc4cb2ae13a346179adb9db0ec710a97fc9a /pkgs/misc/drivers | |
parent | 1ce26aacd1bb418672de796ac64edae162ffd109 (diff) | |
download | nixlib-f89b4dc45057343af8c625bd78738b0433a7f2b0.tar nixlib-f89b4dc45057343af8c625bd78738b0433a7f2b0.tar.gz nixlib-f89b4dc45057343af8c625bd78738b0433a7f2b0.tar.bz2 nixlib-f89b4dc45057343af8c625bd78738b0433a7f2b0.tar.lz nixlib-f89b4dc45057343af8c625bd78738b0433a7f2b0.tar.xz nixlib-f89b4dc45057343af8c625bd78738b0433a7f2b0.tar.zst nixlib-f89b4dc45057343af8c625bd78738b0433a7f2b0.zip |
utsushi: 3.59.2 -> unstable-2020-11-10
+ master should be roughly equivalent to 3.62.0 + moving to the community repo because they are way better at fixing things, while upstream epson almost never merges fixes + great thanks to @mwilsoncoding for debugging the problem: + `autoconf-archive` was missing
Diffstat (limited to 'pkgs/misc/drivers')
-rw-r--r-- | pkgs/misc/drivers/utsushi/default.nix | 46 |
1 files changed, 30 insertions, 16 deletions
diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index 294bb8a0203e..10b5e570d0fa 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -1,20 +1,32 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, boost, gtkmm2 -, imagemagick, sane-backends, tesseract4, udev, libusb1}: +{ stdenv, writeScriptBin, fetchFromGitLab, autoreconfHook, pkg-config +, autoconf-archive, libxslt, boost , gtkmm2 , imagemagick, sane-backends +, tesseract4, udev, libusb1, gnum4 }: -stdenv.mkDerivation rec { + +let + fakegit = writeScriptBin "git" '' + #! ${stdenv.shell} -e + if [ "$1" = "describe" ]; then + [ -r .rev ] && cat .rev || true + fi + ''; +in stdenv.mkDerivation rec { pname = "utsushi"; - version = "3.59.2"; + version = "unstable-2020-11-10"; - src = fetchFromGitLab{ + src = fetchFromGitLab { owner = pname; - repo = "imagescan"; - rev = version; - sha256 = "06gp97dfnf43l6kb988scmm66q9n5rc7ndwv3rykrdpyhy8rbi05"; + repo = pname; + rev = "04700043e2d16062eb8bd27f4efff3024f387d32"; + sha256 = "0rxv5n0985d414i6hwichsn7hybwgwsimpy5s4hmcsvxqcpks4li"; }; nativeBuildInputs = [ autoreconfHook pkg-config + autoconf-archive + fakegit + libxslt ]; buildInputs = [ @@ -26,19 +38,21 @@ stdenv.mkDerivation rec { libusb1.dev ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=parentheses -Wno-error=unused-variable"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=deprecated-declarations" + "-Wno-error=parentheses" + "-Wno-error=unused-variable" + ]; + postPatch = '' - # remove vendored dependencies - rm -r upstream/boost - # create fake udev and sane config mkdir -p $out/etc/{sane.d,udev/rules.d} touch $out/etc/sane.d/dll.conf - - # absolute paths to conver & tesseract + # absolute paths to convert & tesseract + sed -i '/\[AC_DEFINE(\[HAVE_IMAGE_MAGICK\], \[1\])/a \ MAGICK_CONVERT="${imagemagick}/bin/convert"' configure.ac substituteInPlace filters/magick.cpp \ - --replace '"convert' '"${imagemagick}/bin/convert' + --replace 'convert ' '${imagemagick}/bin/convert ' substituteInPlace filters/reorient.cpp \ --replace '"tesseract' '"${tesseract4}/bin/tesseract' substituteInPlace filters/get-text-orientation \ @@ -61,7 +75,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doInstallCheck = true; + doInstallCheck = false; meta = with stdenv.lib; { description = "SANE utsushi backend for some Epson scanners"; |