guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

12/52: gnu: dbus-cairo: Add missing bash-minimal input.


From: guix-commits
Subject: 12/52: gnu: dbus-cairo: Add missing bash-minimal input.
Date: Mon, 20 Sep 2021 07:19:29 -0400 (EDT)

mothacehe pushed a commit to branch core-updates-frozen
in repository guix.

commit 499dbe0f3c4f9a86b5e44aa415de0bd18146b216
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 24 11:24:57 2021 +0200

    gnu: dbus-cairo: Add missing bash-minimal input.
    
    If absent, this causes the 'glib-or-gtk-wrap' phase to fail.
    
    * gnu/packages/glib.scm
      (cairo)[inputs]: Add "bash-minimal", but only when cross-compiling
      to avoid a world-rebuild.
---
 gnu/packages/gtk.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 8760712..900ee0a 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -61,6 +61,7 @@
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages build-tools)
   #:use-module (gnu packages texinfo)
@@ -174,7 +175,11 @@ tools have full access to view and control running 
applications.")
        ("pkg-config" ,pkg-config)
        ("python" ,python-wrapper)))
     (inputs
-     `(("drm" ,libdrm)
+     ;; TODO(core-updates): make this unconditional
+     `(,@(if (%current-target-system)
+             `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap
+             '())
+       ("drm" ,libdrm)
        ("ghostscript" ,ghostscript)
        ("libspectre" ,libspectre)
        ("poppler" ,poppler)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]