From 63f931cf82460cecdeef2d147add07e5b671cc73 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 27 Feb 2018 01:46:58 +0100 Subject: [PATCH] gnu: gcab: Update to 1.1. * gnu/packages/package-management.scm (gcab): Update to 1.1. [source]: Remove git dependency in a snippet. --- gnu/packages/package-management.scm | 13 +++++++++++-- 1 file 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