guix-commits
[Top][All Lists]
Advanced

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

15/75: build-system/font: Add #:license-file-regexp argument.


From: guix-commits
Subject: 15/75: build-system/font: Add #:license-file-regexp argument.
Date: Sun, 21 Jan 2024 13:21:43 -0500 (EST)

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

commit 5e0c7c88e9e82dd8e0a5ee83492d9a89a4c1c966
Author: Simon South <simon@simonsouth.net>
AuthorDate: Fri Feb 3 07:42:58 2023 -0500

    build-system/font: Add #:license-file-regexp argument.
    
    * guix/build-system/font.scm (font-build): Add #:license-file-regexp 
argument
    and honour it.
    * guix/build/font-build-system.scm (%license-file-regexp): New variable,
    duplicated from (gnu build gnu-build-system).
---
 guix/build-system/font.scm       | 2 ++
 guix/build/font-build-system.scm | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm
index b18d4af625..a4eeca00ca 100644
--- a/guix/build-system/font.scm
+++ b/guix/build-system/font.scm
@@ -76,6 +76,7 @@
                      (tests? #t)
                      (test-target "test")
                      (configure-flags ''())
+                     (license-file-regexp '%license-file-regexp)
                      (phases '%standard-phases)
                      (outputs '("out"))
                      (search-paths '())
@@ -97,6 +98,7 @@
                             #:system #$system
                             #:test-target #$test-target
                             #:tests? #$tests?
+                            #:license-file-regexp #$license-file-regexp
                             #:phases #$(if (pair? phases)
                                            (sexp->gexp phases)
                                            phases)
diff --git a/guix/build/font-build-system.scm b/guix/build/font-build-system.scm
index e4784bc17d..8418ada1d2 100644
--- a/guix/build/font-build-system.scm
+++ b/guix/build/font-build-system.scm
@@ -23,6 +23,7 @@
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:export (%standard-phases
+            %license-file-regexp
             font-build))
 
 ;; Commentary:
@@ -56,6 +57,10 @@ archive, or a font file."
     (for-each (cut install-file <> (string-append fonts "/web"))
               (find-files source "\\.(woff|woff2)$"))))
 
+(define %license-file-regexp
+  ;; Regexp matching license files.
+  "^(COPYING.*|LICEN[CS]E.*|[Ll]icen[cs]e.*|Copy[Rr]ight(\\.(txt|md))?)$")
+
 (define %standard-phases
   (modify-phases gnu:%standard-phases
     (replace 'unpack unpack)



reply via email to

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