diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-22 18:14:04 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-22 18:14:04 +0200 |
| commit | 233df51ebc162bf95dfadf914914cbfbc6984651 (patch) | |
| tree | 06fa8d78bbe97619450a88d8a38d01dc3775655b /gnu/packages/password-utils.scm | |
| parent | 43cec3fb1ea54dedee8a5f613c833958c76892f4 (diff) | |
| parent | 180a8986e57a6cfb65a8cddabcb430f23801832b (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/password-utils.scm')
| -rw-r--r-- | gnu/packages/password-utils.scm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 06b2873dd2..b9653693c6 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2018 Thomas Sigurdsen <tonton@riseup.net> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Pierre Neidhardt <ambrevar@gmail.com> +;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -461,8 +462,18 @@ through the pass command.") (let ((out (assoc-ref outputs "out"))) (substitute* "Makefile" (("PREFIX = /usr") (string-append "PREFIX = " out))) + (substitute* "libargon2.pc" + (("prefix=/usr") (string-append "prefix=" out)) + (("@HOST_MULTIARCH@") "") + (("@UPSTREAM_VER@") ,version)) #t))) - (delete 'configure)))) + (delete 'configure) + (add-after 'install 'install-argon2.pc + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "libargon2.pc" + (string-append out "/lib/pkgconfig")) + #t)))))) (home-page "https://www.argon2.com/") (synopsis "Password hashing library") (description "Argon2 provides a key derivation function that was declared |