branch master updated: gnu: sequoia: Fix pkgconfig files.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

htgoebel pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new fbe17e2  gnu: sequoia: Fix pkgconfig files.
fbe17e2 is described below

commit fbe17e242b539004e3aa1458c2e9ccbc635ddfb8
Author: Hartmut Goebel <address@hidden>
AuthorDate: Mon May 11 00:00:47 2020 +0200

    gnu: sequoia: Fix pkgconfig files.
    
    The pkgconfig files defines the wrong prefix: It is the build directory, 
while
    it should be the installation prefix. This is caused by Makefiles replacing
    `PREFIX` by `$(shell pwd)`.
    
    See <https://gitlab.com/sequoia-pgp/sequoia/-/issues/502> for details.
    
    * gnu/packages/sequoia.scm (sequoia)[fix-pkgconfig-file-substitutes]: New
      phase.
---
 gnu/packages/sequoia.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm
index 1c21c9c..91c1dcd 100644
--- a/gnu/packages/sequoia.scm
+++ b/gnu/packages/sequoia.scm
@@ -148,6 +148,15 @@
                  (("\\ssetup.py\\s+install\\s")
                   " setup.py install --root=/ 
--single-version-externally-managed "))
                #t)))
+         (add-after 'unpack 'fix-pkgconfig-file-substitutes
+           ;; preempt Makefiles replacing PREFIX by pwd
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (substitute* "ffi/sequoia.pc.in"
+                 (("PREFIX") out))
+               (substitute* "openpgp-ffi/sequoia-openpgp.pc.in"
+                 (("PREFIX") out))
+               #t)))
          (add-after 'unpack 'set-missing-env-vars
            (lambda* (#:key inputs #:allow-other-keys)
              ;; FIXME: why do we need to set this here?