From d2b9b4b861b71d11eaeaa12fe544c9ffb0b6644d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Feb 2023 08:54:33 -0500 Subject: gnu: gstreamer: Do not reference Python. * gnu/packages/gstreamer.scm (gstreamer) [native-inputs]: Replace python-wrapper with python. [arguments]: List python in #:disallowed-references. Add a 'do-not-capture-python phase. --- gnu/packages/gstreamer.scm | 47 +++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 916ab2e990..8cfff4d66a 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -477,28 +478,40 @@ the GStreamer multimedia framework.") "0aisl8nazcfi4b5j6fz8zwpp0k9csb022zniz65b2pxxpdjayzb0")))) (build-system meson-build-system) (arguments - (list #:phases - #~(modify-phases %standard-phases - #$@%common-gstreamer-phases - #$@(if (string-prefix? "i686" (or (%current-target-system) - (%current-system))) - ;; FIXME: These tests consistently fail in the Guix CI: - ;; https://issues.guix.gnu.org/57868 - '((add-after 'unpack 'disable-systemclock-test - (lambda _ - (substitute* "tests/check/gst/gstsystemclock.c" - (("tcase_add_test \\(tc_chain, \ + (list + #:disallowed-references (list python) + #:phases + #~(modify-phases %standard-phases + #$@%common-gstreamer-phases + #$@(if (string-prefix? "i686" (or (%current-target-system) + (%current-system))) + ;; FIXME: These tests consistently fail in the Guix CI: + ;; https://issues.guix.gnu.org/57868 + '((add-after 'unpack 'disable-systemclock-test + (lambda _ + (substitute* "tests/check/gst/gstsystemclock.c" + (("tcase_add_test \\(tc_chain, \ test_stress_cleanup_unschedule.*") - "") - (("tcase_add_test \\(tc_chain, \ + "") + (("tcase_add_test \\(tc_chain, \ test_stress_reschedule.*") - ""))))) - '())))) + ""))))) + '()) + (add-after 'patch-shebangs 'do-not-capture-python + (lambda _ + ;; The patch-source-shebangs phase causes the following build + ;; script to reference Python in its shebang, which is + ;; unnecessary. + (substitute* (string-append #$output + "/libexec/gstreamer-1.0/" + "gst-plugins-doc-cache-generator") + (((which "python3")) + "/usr/bin/env python3"))))))) (propagated-inputs ;; In gstreamer-1.0.pc: ;; Requires: glib-2.0, gobject-2.0 ;; Requires.private: gmodule-no-export-2.0 libunwind libdw - (list elfutils ; libdw + (list elfutils ;libdw glib libunwind)) (native-inputs (list bash-completion @@ -508,7 +521,7 @@ test_stress_reschedule.*") gobject-introspection perl pkg-config - python-wrapper)) + python)) (inputs (list gmp libcap ;; For tests. -- cgit v1.2.3