~ruther/guix-local

7c7ca0b62579838e3929e808a9b475ecc59f1515 — Maxime Devos 5 years ago 9415359
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
1 files changed, 13 insertions(+), 4 deletions(-)

M guix/build-system/qt.scm
M guix/build-system/qt.scm => guix/build-system/qt.scm +13 -4
@@ 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