summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2018-02-27 01:46:58 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2018-02-27 16:49:57 +0100
commit63f931cf82460cecdeef2d147add07e5b671cc73 (patch)
tree812641ef20e30649e9442734889bac95c61b92e8 /gnu
parent36d48a536e0bd86f1fdb7f41038db4aa4e0507cb (diff)
downloadguix-63f931cf82460cecdeef2d147add07e5b671cc73.tar.gz
gnu: gcab: Update to 1.1.
* gnu/packages/package-management.scm (gcab): Update to 1.1.
[source]: Remove git dependency in a snippet.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/package-management.scm13
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 32a7a30e7a..6ec70b12fe 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -791,14 +791,23 @@ on top of GNU Guix.")
 (define-public gcab
   (package
     (name "gcab")
-    (version "1.0")
+    (version "1.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
                                   version "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1ji8j8pnxqaycbp9ydi2zq7gcr02c2vw4qnc198i6jwy9zkh2x19"))))
+                "0l19sr6pg0cfcddmi5n79d08mjjbhn427ip5jlsy9zddq9r24aqr"))
+              ;; gcab 1.1 has a hard dependency on git — even when building
+              ;; from a tarball.  Remove it early so ‘guix environment gcab’
+              ;; can actually build what ‘guix build --source gcab’ returns.
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (substitute* "meson.build"
+                    (("git_version = .*$") "git_version = []\n"))
+                  #t))))
     (build-system meson-build-system)
     (native-inputs
      `(("glib:bin" ,glib "bin")         ; for glib-mkenums