guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/05: gnu: nomad: Fix missing webkit2gtk-4.0 compilation error.


From: guix-commits
Subject: 02/05: gnu: nomad: Fix missing webkit2gtk-4.0 compilation error.
Date: Mon, 24 Jan 2022 04:38:57 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 23792ae634aaa0acfbc95d4b13052ff59a37b580
Author: Zhu Zihao <all_but_last@163.com>
AuthorDate: Sat Jan 22 19:42:23 2022 +0800

    gnu: nomad: Fix missing webkit2gtk-4.0 compilation error.
    
    * gnu/package/guile-xyz.scm (nomad)[arguments]<phases>: Add phase
    'fix-webkitgtk' to update webkit2gtk-4.0 reference in file 'configure.ac'
    and 'typelib/Makefile.am'.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/guile-xyz.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 9a7e7d8ba4..e2cf793acc 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3444,6 +3444,16 @@ perform geometrical transforms on JPEG images.")
                   (srfi srfi-26))
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'fix-webkitgtk
+           (lambda _
+             ;; Adapt to the version we have in Guix.
+             (substitute* "configure.ac"
+               (("webkit2gtk-4\\.0") "webkit2gtk-4.1")
+               (("webkit2gtk-web-extension-4\\.0")
+                "webkit2gtk-web-extension-4.1"))
+
+             (substitute* "typelib/Makefile.am"
+               (("WebKit2-4\\.0") "WebKit2-4.1"))))
          (add-before 'check 'start-xorg-server
            (lambda* (#:key inputs #:allow-other-keys)
              ;; The test suite requires a running X server.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]