[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/10: guix: build-system: qt: Support #:disallowed-references.
From: |
guix-commits |
Subject: |
06/10: guix: build-system: qt: Support #:disallowed-references. |
Date: |
Mon, 22 Jan 2024 00:24:00 -0500 (EST) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 11131a029229b0ee0e66789ca8b05635b3b0d8cc
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Mon Mar 29 17:14:08 2021 +0200
guix: build-system: qt: Support #:disallowed-references.
* guix/build-system/qt.scm
(qt-build): Support #:allowed-references and #:disallowed-references.
(qt-cross-build): Likewise.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: Ia2c36152bc3500a4e73b204b0a006f3bb9405d58
---
guix/build-system/qt.scm | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm
index 978aed0fc1..bce2ead212 100644
--- a/guix/build-system/qt.scm
+++ b/guix/build-system/qt.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
@@ -142,7 +143,9 @@
(system (%current-system))
(imported-modules %qt-build-system-modules)
(modules '((guix build qt-build-system)
- (guix build utils))))
+ (guix build utils)))
+ allowed-references
+ disallowed-references)
"Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE
provides a 'CMakeLists.txt' file as its build system."
(define builder
@@ -181,7 +184,9 @@ provides a 'CMakeLists.txt' file as its build system."
(gexp->derivation name builder
#:graft? #f ;consistent with 'gnu-build'
#:system system
- #:guile-for-build guile)))
+ #:guile-for-build guile
+ #:allowed-references allowed-references
+ #:disallowed-references disallowed-references)))
;;;
@@ -214,7 +219,9 @@ provides a 'CMakeLists.txt' file as its build system."
(build (nix-system->gnu-triplet system))
(imported-modules %qt-build-system-modules)
(modules '((guix build qt-build-system)
- (guix build utils))))
+ (guix build utils)))
+ allowed-references
+ disallowed-references)
"Cross-build NAME using CMAKE for TARGET, where TARGET is a GNU triplet and
with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its
build system."
@@ -268,7 +275,9 @@ build system."
(gexp->derivation name builder
#:graft? #f ;consistent with 'gnu-build'
#:system system
- #:guile-for-build guile)))
+ #:guile-for-build guile
+ #:allowed-references allowed-references
+ #:disallowed-references disallowed-references)))
(define qt-build-system
(build-system
- branch core-updates updated (552ebc47af -> 7c60d1e14f), guix-commits, 2024/01/22
- 04/10: gnu: sphinx: Use 'imagemagick/stable' variant., guix-commits, 2024/01/22
- 06/10: guix: build-system: qt: Support #:disallowed-references.,
guix-commits <=
- 08/10: build-systems: cmake: Add support for #:allowed-references., guix-commits, 2024/01/22
- 09/10: gnu: inkscape/stable: Build stable variant without imagemagick support., guix-commits, 2024/01/22
- 10/10: gnu: hwdata: Update to 0.374., guix-commits, 2024/01/22
- 02/10: build-system: python: Add allowed/disallowed keyword arguments., guix-commits, 2024/01/22
- 01/10: gnu: Use 'gtk-doc/stable' in native-inputs instead of 'gtk-doc'., guix-commits, 2024/01/22
- 05/10: gnu: wpa-supplicant-gui: Use 'imagemagick/stable' variant., guix-commits, 2024/01/22
- 07/10: gnu: bandage: Do not yet use the 'imagemagick/stable' variant., guix-commits, 2024/01/22
- 03/10: build-system: pyproject: Add allowed/disallowed keyword arguments., guix-commits, 2024/01/22