diff mbox series

[bug#49327,core-updates,002/128] gnu: xorg: Add 'bash' input for 'wrap-program'.

Message ID 20210702100814.23249-2-maximedevos@telenet.be
State New
Headers show
Series Add 'bash' input for 'wrap-program'. | expand

Commit Message

M July 2, 2021, 10:06 a.m. UTC 
It is required for cross-compilation.

* gnu/packages/xorg.scm
  (mkfontdir)[inputs]: Add 'bash-minimal'.
  (xpra)[inputs]: Likewise.
---
 gnu/packages/xorg.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Maxim Cournoyer Oct. 20, 2023, 3:30 a.m. UTC | #1 
Hi,

Manually redid the work for xorg.scm (couldn't apply).
diff mbox series

Patch

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 1afd028bbd..e747dea769 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -56,6 +56,7 @@ 
   #:use-module (gnu packages)
   #:use-module (gnu packages anthy)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
@@ -4964,7 +4965,8 @@  protocol and arbitrary X extension protocol.")
                                   "/bin"))))
              #t)))))
     (inputs
-      `(("mkfontscale" ,mkfontscale)))
+     `(("bash" ,bash-minimal)
+       ("mkfontscale" ,mkfontscale)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("automake" ,automake))) ;For up to date 'config.guess' and 'config.sub'.
@@ -6315,7 +6317,7 @@  basic eye-candy effects.")
        (patches (search-patches "xpra-4.0.1-systemd-run.patch"))))
     (build-system python-build-system)
     ;; see also http://xpra.org/trac/wiki/Dependencies
-    (inputs `(
+    (inputs `(("bash" ,bash) ; for wrap-program
               ;; Essential dependencies.
               ("libjpeg" ,libjpeg-turbo)
               ("libwebp" ,libwebp)