diff options
author | 宋文武 <iyzsong@gmail.com> | 2015-04-08 16:04:37 +0800 |
---|---|---|
committer | 宋文武 <iyzsong@gmail.com> | 2015-04-08 16:04:37 +0800 |
commit | cf3e3e374c4bd1c9f0f976fc8f02f66aff6417dc (patch) | |
tree | b4ce7938c855781af2e0a1e68b3588f96de7e7e1 /gnu/packages/gstreamer.scm | |
parent | 4ae7559fd62c03a800b010c228639f18b9f58006 (diff) | |
parent | 068a53c36dec5ace42cc3ea89060d9a485592f08 (diff) | |
download | guix-patches-cf3e3e374c4bd1c9f0f976fc8f02f66aff6417dc.tar guix-patches-cf3e3e374c4bd1c9f0f976fc8f02f66aff6417dc.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gstreamer.scm')
-rw-r--r-- | gnu/packages/gstreamer.scm | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 7afb9c4218..ad0cfccca9 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -88,11 +88,19 @@ arrays of data.") (base32 "1bmhbhak6i5wmmb6w86jyyv8lax4gdq983la4lk4a0krz6kim020")))) (build-system gnu-build-system) + (outputs '("out" "doc")) + (arguments + `(#:make-flags '("CC=gcc") ; for g-ir-scanner. + #:configure-flags + (list (string-append "--with-html-dir=" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")))) (propagated-inputs `(("glib" ,glib))) ; required by gstreamer-1.0.pc. (native-inputs `(("bison" ,bison) ("flex" ,flex) ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper))) @@ -150,6 +158,9 @@ This package provides the core library and elements.") (base32 "07ampnfa6p41s0lhia62l9h8bdx3c7vxvdz93pbx64m3wycq3gbp")))) (build-system gnu-build-system) + (outputs '("out" "doc")) + (propagated-inputs + `(("gstreamer" ,gstreamer))) ; required by gstreamer-plugins-base-1.0.pc (inputs `(("cdparanoia" ,cdparanoia) ("orc" ,orc) @@ -161,19 +172,25 @@ This package provides the core library and elements.") ("zlib" ,zlib) ("libXext" ,libxext) ("libxv" ,libxv) - ("alsa-lib" ,alsa-lib) - ("gstreamer" ,gstreamer))) + ("alsa-lib" ,alsa-lib))) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) ("python-wrapper" ,python-wrapper))) (arguments - '(#:phases + `(#:configure-flags + (list (string-append "--with-html-dir=" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) + #:phases (alist-cons-before - 'configure 'patch-test-pb-utils + 'configure 'patch (lambda _ (substitute* "tests/check/libs/pbutils.c" - (("/bin/sh") (which "sh")))) + (("/bin/sh") (which "sh"))) + ;; for g-ir-scanner. + (setenv "CC" "gcc")) %standard-phases))) (home-page "http://gstreamer.freedesktop.org/") (synopsis |