summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2021-02-15 16:20:39 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2021-02-15 17:23:55 +0100
commit78ce446b20f132025389bff122fb1166b3a3a911 (patch)
tree4e7ba1d27ea53f84e0b17f5080cbabf0a50d6940 /gnu
parentcf9047b222934a3e4455cb1e1058d21c94b7214d (diff)
downloadguix-78ce446b20f132025389bff122fb1166b3a3a911.tar.gz
gnu: sane-backends-minimal: Update to 1.0.32.
* gnu/packages/scanner.scm (sane-backends-minimal): Update to 1.0.32.
[arguments]: Adapt the ‘zap-unnecessary-git-dependency’ phase to the new
tools/git-version-gen script.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/scanner.scm12
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm
index 08dd871bc2..a97131b362 100644
--- a/gnu/packages/scanner.scm
+++ b/gnu/packages/scanner.scm
@@ -43,7 +43,7 @@
 (define-public sane-backends-minimal
   (package
     (name "sane-backends-minimal")
-    (version "1.0.31")
+    (version "1.0.32")
     (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -51,7 +51,7 @@
                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
-              (base32 "161hh2zcs2fh6vxxgavf3m0xbm1gbxkasp10p8964pkzxax8rwqp"))
+              (base32 "13jlqdp7n7z2n78v6idl3ri5idk7ddk9j8wrmh73lba8l9y8xnsi"))
              (modules '((guix build utils)))
              (snippet
               ;; Generated HTML files and udev rules normally embed a
@@ -77,9 +77,11 @@
        (modify-phases %standard-phases
          (add-before 'bootstrap 'zap-unnecessary-git-dependency
            (lambda _
-             (substitute* "configure.ac"
-               (("git describe --dirty")
-                (string-append "echo " ,version)))))
+             ;; This runs before default patch-shebangs phase.
+             (substitute* "tools/git-version-gen"
+               (("/bin/sh") (which "sh")))
+             (with-output-to-file ".tarball-version"
+               (lambda _ (format #t ,version)))))
          (add-before 'configure 'disable-backends
            (lambda _
              (setenv "BACKENDS" " ")