branch core-updates updated: gnu: spice-gtk: Add an absolute reference for libjpeg in the .la files.

[guix-commits]

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

mbakke pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 29c6fb0  gnu: spice-gtk: Add an absolute reference for libjpeg in the 
.la files.
29c6fb0 is described below

commit 29c6fb0d33b3bea8677093eed1cfbd6483c9fbe8
Author: Marius Bakke <address@hidden>
AuthorDate: Fri Apr 10 15:53:19 2020 +0200

    gnu: spice-gtk: Add an absolute reference for libjpeg in the .la files.
    
    * gnu/packages/spice.scm (spice-gtk)[arguments]: Add phase 'patch-la-files.
---
 gnu/packages/spice.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index 8b688ea..b1b5396 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2016 David Craven <address@hidden>
 ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2019 Rutger Helling <address@hidden>
-;;; Copyright © 2019 Marius Bakke <address@hidden>
+;;; Copyright © 2019, 2020 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -175,6 +175,16 @@ which allows users to view a desktop computing 
environment.")
                (substitute* "tests/Makefile"
                  (("test-session\\$\\(EXEEXT\\) ") ""))
                #t))
+           (add-after 'install 'patch-la-files
+             (lambda* (#:key inputs outputs #:allow-other-keys)
+               (let ((out (assoc-ref outputs "out"))
+                     (libjpeg (assoc-ref inputs "libjpeg")))
+                 ;; Add an absolute reference for libjpeg in the .la files
+                 ;; so it does not have to be propagated.
+                 (substitute* (find-files (string-append out "/lib") "\\.la$")
+                   (("-ljpeg")
+                    (string-append "-L" libjpeg "/lib -ljpeg")))
+                 #t)))
            (add-after
             'install 'wrap-spicy
             (lambda* (#:key inputs outputs #:allow-other-keys)