me
/
guix
Archived
1
0
Fork 0
Code

gnu: gnome-keyring: Update to 3.28.2. 

* gnu/packages/gnome.scm (gnome-keyring): Update to 3.28.2.
[arguments]: Replace "pre-check" phase with "fix-/bin/sh-reference".
[inputs]: Add openssh.
master
Ricardo Wurmus 2018-08-06 12:26:31 +02:00
parent dd7a244614
commit ab35cc6e5b
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/gnome.scm
View File

@ -672,7 +672,7 @@ GNOME Desktop.")
(define-public gnome-keyring (define-public gnome-keyring
(package (package
(name "gnome-keyring") (name "gnome-keyring")
(version "3.20.1") (version "3.28.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -680,7 +680,7 @@ GNOME Desktop.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"134ci3mn6jjap59z3lrvyiip7zf2nlw5xvanr44yajs57xr4x5lp")))) "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ;48 of 603 tests fail because /var/lib/dbus/machine-id does `(#:tests? #f ;48 of 603 tests fail because /var/lib/dbus/machine-id does
@ -693,11 +693,11 @@ GNOME Desktop.")
(assoc-ref %outputs "out") "/share/p11-kit/modules/")) (assoc-ref %outputs "out") "/share/p11-kit/modules/"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before (add-after 'unpack 'fix-/bin/sh-reference
'check 'pre-check (lambda _
(lambda* (#:key inputs #:allow-other-keys) (substitute* "po/Makefile.in.in"
(substitute* "build/tap-driver" (("/bin/sh") (which "sh")))
(("/usr/bin/env python") (which "python"))))) #t))
(add-before (add-before
'configure 'fix-docbook 'configure 'fix-docbook
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -710,7 +710,6 @@ GNOME Desktop.")
(setenv "XML_CATALOG_FILES" (setenv "XML_CATALOG_FILES"
(string-append (assoc-ref inputs "docbook-xml") (string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook/catalog.xml")) "/xml/dtd/docbook/catalog.xml"))
;; Rerun the whole thing to avoid version mismatch ("This is ;; Rerun the whole thing to avoid version mismatch ("This is
;; Automake 1.15.1, but the definition used by this ;; Automake 1.15.1, but the definition used by this
;; AM_INIT_AUTOMAKE comes from Automake 1.15."). Note: we don't ;; AM_INIT_AUTOMAKE comes from Automake 1.15."). Note: we don't
@ -721,6 +720,7 @@ GNOME Desktop.")
(inputs (inputs
`(("libgcrypt" ,libgcrypt) `(("libgcrypt" ,libgcrypt)
("linux-pam" ,linux-pam) ("linux-pam" ,linux-pam)
("openssh" ,openssh)
("dbus" ,dbus) ("dbus" ,dbus)
("gcr" ,gcr))) ("gcr" ,gcr)))
(native-inputs (native-inputs