[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#67808] [PATCH 1/5] guix: build-system: font: Accept license-file-re
From: |
Saku Laesvuori |
Subject: |
[bug#67808] [PATCH 1/5] guix: build-system: font: Accept license-file-regexp keyword argument |
Date: |
Wed, 13 Dec 2023 10:00:35 +0200 |
* guix/build-system/font.scm: (font-build): Pass license-file-regexp
keyword argument to font-build.
* guix/build-system/gnu.scm: Export %license-file-regexp.
Change-Id: I4e9378cbed9a8c3b9838efcd448e9bfec8ba97be
---
guix/build-system/font.scm | 2 ++
guix/build-system/gnu.scm | 1 +
2 files changed, 3 insertions(+)
diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm
index c57c304f52..893e9f635e 100644
--- a/guix/build-system/font.scm
+++ b/guix/build-system/font.scm
@@ -81,6 +81,7 @@ (define* (font-build name inputs
(search-paths '())
(system (%current-system))
(guile #f)
+ (license-file-regexp %license-file-regexp)
(imported-modules %font-build-system-modules)
(modules '((guix build font-build-system)
(guix build utils))))
@@ -94,6 +95,7 @@ (define* (font-build name inputs
#~(font-build #:name #$name
#:source #+source
#:configure-flags #$configure-flags
+ #:license-file-regexp #$license-file-regexp
#:system #$system
#:test-target #$test-target
#:tests? #$tests?
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index cdbb547773..b8082354b9 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -28,6 +28,7 @@ (define-module (guix build-system gnu)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match)
#:export (%gnu-build-system-modules
+ %license-file-regexp
%strip-flags
%strip-directories
gnu-build
base-commit: 4bf4e340b74b66a0fc319aeb100fb1f948a67211
--
2.41.0
- [bug#67808] [PATCH 1/5] guix: build-system: font: Accept license-file-regexp keyword argument,
Saku Laesvuori <=
- [bug#67808] [PATCH 2/5] gnu: Add font-jetbrains-mono-nerd-font, Saku Laesvuori, 2023/12/13
- [bug#67808] [PATCH 4/5] gnu: font-jetbrains-mono: Use the correct license., Saku Laesvuori, 2023/12/13
- [bug#67808] [PATCH 3/5] gnu: font-jetbrains-mono: Use license-file-regexp argument, Saku Laesvuori, 2023/12/13
- [bug#67808] [PATCH 5/5] gnu: font-jetbrains-mono: Update to 2.304, Saku Laesvuori, 2023/12/13
- [bug#67808] [PATCH 1/5] guix: build-system: font: Accept license-file-regexp keyword argument, Simon South, 2023/12/13
- [bug#67808] [PATCH v2 0/1] Add JetBrainsMono Nerd Font, Saku Laesvuori, 2023/12/14
- [bug#67808] [PATCH v3 0/3] Add procedure for patching Nerd Fonts, Saku Laesvuori, 2023/12/14
- [bug#67808] [PATCH v3 1/3] gnu: Add nerd-font-patcher, Saku Laesvuori, 2023/12/14