guix-commits
[Top][All Lists]
Advanced

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

22/51: gnu: lightdm: Explicitely use a native 'bash' for 'wrap-program'.


From: guix-commits
Subject: 22/51: gnu: lightdm: Explicitely use a native 'bash' for 'wrap-program'.
Date: Sat, 21 Oct 2023 15:19:32 -0400 (EDT)

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

commit c7e222298ef2e3d45cae72f3e1f95a1d96771d31
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Jul 2 12:07:37 2021 +0200

    gnu: lightdm: Explicitely use a native 'bash' for 'wrap-program'.
    
    Having to use a native bash for 'wrap-program' is fairly
    unusual, but here it is the right thing, as it is for
    the test suite only.  Placate the 'wrapper-inputs' linter.
    
    Also, eventually we might consider letting 'wrap-program'
    bail out if no bash for the host is found, even when
    compiling natively.  But that's for later.
    
    * gnu/packages/display-managers.scm
      (lightdm)[arguments]<#:phases>{pre-check}: Set #:sh
      argument of 'pre-check'
    
    Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/packages/display-managers.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/display-managers.scm 
b/gnu/packages/display-managers.scm
index 327a29aa9e..d3711ee6eb 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -309,6 +309,7 @@ experience for your users, your family and yourself")
          (add-before 'check 'pre-check
            (lambda _
              (wrap-program "tests/src/test-python-greeter"
+               #:sh (which "bash")
                `("GUIX_PYTHONPATH"      ":" prefix (,(getenv 
"GUIX_PYTHONPATH")))
                `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))
              ;; Avoid printing locale warnings, which trip up the text



reply via email to

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