[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
192/416: gnu: gstreamer: Do not reference Python.
From: |
guix-commits |
Subject: |
192/416: gnu: gstreamer: Do not reference Python. |
Date: |
Fri, 14 Apr 2023 15:25:51 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 864a7478e85d99f08122b0120ad695164ee55dbe
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Feb 8 08:54:33 2023 -0500
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 | 46 +++++++++++++++++++++++++++++-----------------
1 file changed, 29 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index f33a30a02b..7aa9500620 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -475,28 +475,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
@@ -506,7 +518,7 @@ test_stress_reschedule.*")
gobject-introspection
perl
pkg-config
- python-wrapper))
+ python))
(inputs
(list gmp libcap
;; For tests.
- 173/416: gnu: rust-string-cache-0.8: Update to 0.8.4., (continued)
- 173/416: gnu: rust-string-cache-0.8: Update to 0.8.4., guix-commits, 2023/04/14
- 174/416: gnu: rust-string-cache-codegen-0.5: Update to 0.5.2., guix-commits, 2023/04/14
- 177/416: gnu: rust-encoding-rs-0.8: Update to 0.8.31., guix-commits, 2023/04/14
- 178/416: gnu: rust-futf-0.1: Update to 0.1.5., guix-commits, 2023/04/14
- 186/416: gnu: fluidsynth: Remove lash input., guix-commits, 2023/04/14
- 187/416: gnu: fluidsynth: Update to 2.3.1., guix-commits, 2023/04/14
- 189/416: gnu: speex: Update to 1.2.1., guix-commits, 2023/04/14
- 190/416: gnu: ibus-minimal: Move Python support to ibus., guix-commits, 2023/04/14
- 183/416: gnu: rust-utf-8-0.7: Update to 0.7.6., guix-commits, 2023/04/14
- 191/416: gnu: ibus-minimal: Disable GTK 2 support., guix-commits, 2023/04/14
- 192/416: gnu: gstreamer: Do not reference Python.,
guix-commits <=
- 194/416: gnu: Add rust-cargon-0.0., guix-commits, 2023/04/14
- 203/416: gnu: Add rust-os-info-3., guix-commits, 2023/04/14
- 205/416: gnu: Add rust-cbindgen-0.20., guix-commits, 2023/04/14
- 206/416: gnu: rust-cargo: Update to 0.60.0., guix-commits, 2023/04/14
- 207/416: gnu: rav1e: Fix building., guix-commits, 2023/04/14
- 209/416: NEWS: Mention new rpm format., guix-commits, 2023/04/14
- 214/416: gnu: gst-plugins-bad: Update to 1.22.1 and reinstate a few tests., guix-commits, 2023/04/14
- 215/416: gnu: gst-plugins-ugly: Update to 1.22.1., guix-commits, 2023/04/14
- 216/416: gnu: gst-libav: Update to 1.22.1., guix-commits, 2023/04/14
- 220/416: gnu: ffmpeg-5: Rename variable to ffmpeg., guix-commits, 2023/04/14