aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-07-09 23:35:30 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-07-09 23:35:30 +0200
commit78affefecc4a3c92a550be22ae0c357f273df659 (patch)
tree7e00ee3e6e04f9de8e227c62d4e0036c8477b056
parent4e073dcd41d47d4e67cc398288bc35edc16ee549 (diff)
downloadguix-78affefecc4a3c92a550be22ae0c357f273df659.tar
guix-78affefecc4a3c92a550be22ae0c357f273df659.tar.gz
gnu: oath-toolkit: Fix FTBFS with GCC 7.
* gnu/packages/authentication.scm (oath-toolkit)[source](patches): Add upstream patch.
-rw-r--r--gnu/packages/authentication.scm15
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm
index 68a6459828..70f2a8c103 100644
--- a/gnu/packages/authentication.scm
+++ b/gnu/packages/authentication.scm
@@ -26,8 +26,6 @@
#:use-module (guix packages))
(define-public oath-toolkit
- ;; If gcc@7 breaks this package before its next release, try patching it:
- ;; <https://gitlab.com/oath-toolkit/oath-toolkit/issues/2#note_52958748>.
(package
(name "oath-toolkit")
(version "2.6.2")
@@ -36,7 +34,18 @@
(method url-fetch)
(uri (string-append "https://download.savannah.nongnu.org/releases/"
name "/" name "-" version ".tar.gz"))
- (patches (search-patches "oath-toolkit-glibc-compat.patch"))
+ (patches
+ (append (search-patches "oath-toolkit-glibc-compat.patch")
+ (list (origin
+ ;; This huge commit updates gnulib for GCC 7 compatibility.
+ (method url-fetch)
+ (uri (string-append
+ "https://gitlab.com/oath-toolkit/oath-toolkit/commit/"
+ "2fffce2a471f74a585939c84cce16ef3015e5d3d.diff"))
+ (file-name "oath-toolkit-update-gnulib.patch")
+ (sha256
+ (base32
+ "088c9s4ay1b54bjqc4mwfs5l3f6357zj5vpw771zlq5g4addd4s0"))))))
(sha256
(base32 "182ah8vfbg0yhv6mh1b6ap944d0na6x7lpfkwkmzb6jl9gx4cd5h"))))
(build-system gnu-build-system)