diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-07-02 20:18:16 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-02 20:18:16 +0200 |
| commit | 4fb916551579d336ebea0dbe968314febb3a99d4 (patch) | |
| tree | 2e101d05ece8408869e6dcad387efb39717f5726 /gnu/packages/gstreamer.scm | |
| parent | 6661b025a6c58be6572fc66c5db1073f56af30b0 (diff) | |
| parent | 30484be05d9e318e89e12f40a55c65766cec700a (diff) | |
| download | guix-patches-4fb916551579d336ebea0dbe968314febb3a99d4.tar guix-patches-4fb916551579d336ebea0dbe968314febb3a99d4.tar.gz | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/gstreamer.scm')
| -rw-r--r-- | gnu/packages/gstreamer.scm | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 39a4eb5fc0..b0f0b032b3 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -110,6 +110,7 @@ arrays of data.") (uri (string-append "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-" version ".tar.xz")) + (patches (search-patches "gstreamer-buffer-reset-offset.patch")) (sha256 (base32 "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf")))) @@ -119,19 +120,7 @@ arrays of data.") `(#:configure-flags (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) - - ,@(if (not (target-64bit?)) - ;; Skip test that fails on 32-bit systems: - ;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/issues/316>. - `(#:phases (modify-phases %standard-phases - (add-before 'check 'disable-gstbufferpool-test - (lambda _ - (substitute* "tests/check/Makefile" - (("^[[:blank:]]+gst/gstbufferpool.*$") - "")) - #t)))) - '()))) + "/share/gtk-doc/html")))) (propagated-inputs `(("glib" ,glib))) ; required by gstreamer-1.0.pc. (native-inputs `(("bison" ,bison) |