From 7c7ca0b62579838e3929e808a9b475ecc59f1515 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Mon, 29 Mar 2021 17:14:08 +0200 Subject: [PATCH] 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 Modified-by: Maxim Cournoyer 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 dc5d65436e..d1f721c54e 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; 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