guix-commits
[Top][All Lists]
Advanced

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

138/181: gnu: tracker: Patch a /bin/bash reference.


From: guix-commits
Subject: 138/181: gnu: tracker: Patch a /bin/bash reference.
Date: Tue, 13 Sep 2022 02:26:11 -0400 (EDT)

apteryx pushed a commit to branch master
in repository guix.

commit 0e60bdf0dcc684d4593a074bc0814c6c5ff77ec5
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Sep 9 22:54:26 2022 -0400

    gnu: tracker: Patch a /bin/bash reference.
    
    * gnu/packages/gnome.scm (tracker)[phases]{patch-paths}: New phase.
    [native-inputs]: Add glibc-utf8-locales.
    [inputs]: Add bash-minimal.
---
 gnu/packages/gnome.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 06803c7442..bc43e191f8 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9222,6 +9222,11 @@ easy, safe, and automatic.")
              "-Dsystemd_user_services=false")
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch-paths
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "utils/trackertestutils/__main__.py"
+               (("/bin/bash")
+                (search-input-file inputs "bin/bash")))))
          (add-before 'configure 'set-shell
            (lambda _
              (setenv "SHELL" (which "bash"))))
@@ -9242,6 +9247,7 @@ easy, safe, and automatic.")
     (native-inputs
      (list gettext-minimal
            `(,glib "bin")
+           glibc-utf8-locales
            gobject-introspection
            docbook-xsl
            docbook-xml
@@ -9256,7 +9262,8 @@ easy, safe, and automatic.")
            python
            vala))
     (inputs
-     (list dbus
+     (list bash-minimal
+           dbus
            libsoup))
     (propagated-inputs
      ;; These are in Requires or Requires.private of tracker-sparql-3.0.pc.



reply via email to

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