guix-commits
[Top][All Lists]
Advanced

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

01/07: gnu: qtbase: Do not capture Python (again).


From: guix-commits
Subject: 01/07: gnu: qtbase: Do not capture Python (again).
Date: Tue, 22 Aug 2023 16:33:56 -0400 (EDT)

apteryx pushed a commit to branch telephony-team
in repository guix.

commit c2e72b6f31cfee5ce525d27ded78f9330b944295
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Aug 22 14:53:50 2023 -0400

    gnu: qtbase: Do not capture Python (again).
    
    Fixes <https://issues.guix.gnu.org/65457>.
    
    * gnu/packages/qt.scm (qtbase) [arguments]: Add #:disallowed-references
    argument to guard against the problem reoccurring in the future.
    Update do-not-capture-python phase.
---
 gnu/packages/qt.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0b43f01be5..a9892554f6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -634,6 +634,8 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
     (build-system cmake-build-system)
     (arguments
      (substitute-keyword-arguments (package-arguments qtbase-5)
+       ((#:disallowed-references _ #f)
+        (list python))
        ((#:configure-flags _ ''())
         `(let ((out (assoc-ref %outputs "out")))
            (list "-DQT_BUILD_TESTS=ON"
@@ -727,7 +729,8 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
             (add-after 'patch-source-shebangs 'do-not-capture-python
               (lambda _
                 (substitute* '("mkspecs/features/uikit/devices.py"
-                               "util/testrunner/qt-testrunner.py")
+                               "util/testrunner/qt-testrunner.py"
+                               "util/testrunner/sanitizer-testrunner.py")
                   (((which "python3"))
                    "/usr/bin/env python3"))))
             (replace 'configure



reply via email to

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