diff mbox series

[bug#34903] build-system/meson: Add #:disallowed-references.

Message ID 20190318135536.5274-1-mbakke@fastmail.com
State Accepted
Headers show
Series [bug#34903] build-system/meson: Add #:disallowed-references. | expand

Checks

Context Check Description
cbaines/applying patch success Successfully applied

Commit Message

Marius Bakke March 18, 2019, 1:55 p.m. UTC 
* guix/build-system/meson.scm (meson-build): Add #:disallowed-references.
---
 guix/build-system/meson.scm | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

Comments

Ludovic Courtès March 19, 2019, 10:19 a.m. UTC | #1 
Hi Marius!

Marius Bakke <mbakke@fastmail.com> skribis:

> * guix/build-system/meson.scm (meson-build): Add #:disallowed-references.

Go for it!

Ludo’.
Marius Bakke March 21, 2019, 6:38 p.m. UTC | #2 
Ludovic Courtès <ludo@gnu.org> writes:

> Hi Marius!
>
> Marius Bakke <mbakke@fastmail.com> skribis:
>
>> * guix/build-system/meson.scm (meson-build): Add #:disallowed-references.
>
> Go for it!

Thanks!  I went ahead and added #:allowed-references while at it and
pushed as ad4910eec06047124d29cb9a8d4b40dafdb71630.
diff mbox series

Patch

diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
index 8d49020454..3156f06b94 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -1,6 +1,6 @@ 
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
-;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -109,9 +109,25 @@ 
                       (system (%current-system))
                       (imported-modules %meson-build-system-modules)
                       (modules '((guix build meson-build-system)
-                                 (guix build utils))))
+                                 (guix build utils)))
+
+                      disallowed-references)
   "Build SOURCE using MESON, and with INPUTS, assuming that SOURCE
 has a 'meson.build' file."
+
+  ;; TODO: Copied from build-system/gnu, factorize this!
+  (define canonicalize-reference
+    (match-lambda
+     ((? package? p)
+      (derivation->output-path (package-derivation store p system
+                                                   #:graft? #f)))
+     (((? package? p) output)
+      (derivation->output-path (package-derivation store p system
+                                                   #:graft? #f)
+                               output))
+     ((? string? output)
+      output)))
+
   (define builder
     `(let ((build-phases (if ,glib-or-gtk?
                              ,phases
@@ -159,7 +175,11 @@  has a 'meson.build' file."
                                 #:inputs inputs
                                 #:modules imported-modules
                                 #:outputs outputs
-                                #:guile-for-build guile-for-build))
+                                #:guile-for-build guile-for-build
+                                #:disallowed-references
+                                (and disallowed-references
+                                     (map canonicalize-reference
+                                          disallowed-references))))
 
 (define meson-build-system
   (build-system