guix-commits
[Top][All Lists]
Advanced

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

05/05: gnu: guile-parted: Add "guile3.0-parted" variant.


From: guix-commits
Subject: 05/05: gnu: guile-parted: Add "guile3.0-parted" variant.
Date: Mon, 13 Jan 2020 17:13:30 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit e5b955580d01b635582691ad7ee52c552ff0812d
Author: Ludovic Court├Ęs <address@hidden>
AuthorDate: Mon Jan 13 23:10:35 2020 +0100

    gnu: guile-parted: Add "guile3.0-parted" variant.
    
    * gnu/packages/guile-xyz.scm (guile-parted)[source]: Add 'modules' and 
'snippet'.
    (guile3.0-parted): New variable.
---
 gnu/packages/guile-xyz.scm | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 9559373..dadbce8 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1077,7 +1077,20 @@ microblogging service.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "01qmv6xnbbq3wih0dl9bscvca2d7zx7bjiqf35y6dkaqsp8nvdxf"))))
+                "01qmv6xnbbq3wih0dl9bscvca2d7zx7bjiqf35y6dkaqsp8nvdxf"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Allow builds with Guile 3.0.
+                  (substitute* "configure.ac"
+                    (("^GUILE_PKG.*")
+                     "GUILE_PKG([3.0 2.2 2.0])\n"))
+
+                  ;; Remove "guile.m4" since it contains an obsolete version
+                  ;; of 'GUILE_PKG' that doesn't work with development
+                  ;; versions such as 2.9.
+                  (delete-file "m4/guile.m4")
+                  #t))))
     (build-system gnu-build-system)
     (arguments
      '(#:make-flags
@@ -1099,6 +1112,15 @@ written in pure Scheme by using Guile's foreign function 
interface.")
     (home-page "https://gitlab.com/mothacehe/guile-parted";)
     (license license:gpl3+)))
 
+(define-public guile3.0-parted
+  (package
+    (inherit guile-parted)
+    (name "guile3.0-parted")
+    (inputs `(("guile" ,guile-next)
+              ,@(alist-delete "guile" (package-inputs guile-parted))))
+    (propagated-inputs
+     `(("guile-bytestructures" ,guile3.0-bytestructures)))))
+
 (define-public guile-xosd
   (package
     (name "guile-xosd")



reply via email to

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