[Top][All Lists]

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

01/07: gnu: gstreamer: Build with Meson.

From: guix-commits
Subject: 01/07: gnu: gstreamer: Build with Meson.
Date: Mon, 20 Jan 2020 17:19:24 -0500 (EST)

mbakke pushed a commit to branch staging
in repository guix.

commit 9792adaa611e495ee1a53e5849a37fef7fa49edf
Author: Marius Bakke <address@hidden>
AuthorDate: Mon Jan 20 21:38:40 2020 +0100

    gnu: gstreamer: Build with Meson.
    The package fails to build with GNU Make 4.3, and upstream no longer 
    * gnu/packages/gstreamer.scm (gstreamer)[build-system]: Change to
    [arguments]: Remove #:configure-flags.  Add #:phases.
    [native-inputs]: Add GTK-DOC.
 gnu/packages/gstreamer.scm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 63b4179..126972f 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -116,19 +116,27 @@ arrays of data.")
-    (build-system gnu-build-system)
+    (build-system meson-build-system)
     (outputs '("out" "doc"))
-     `(#:configure-flags
-       (list (string-append "--with-html-dir="
-                            (assoc-ref %outputs "doc")
-                            "/share/gtk-doc/html"))))
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'move-docs
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share"))
+               (copy-recursively (string-append out "/share/gtk-doc")
+                                 (string-append doc "/share/gtk-doc"))
+               (delete-file-recursively (string-append out "/share/gtk-doc"))
+               #t))))))
     (propagated-inputs `(("glib" ,glib))) ; required by gstreamer-1.0.pc.
      `(("bison" ,bison)
        ("flex" ,flex)
        ("glib" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
        ("perl" ,perl)
        ("pkg-config" ,pkg-config)
        ("python-wrapper" ,python-wrapper)))

reply via email to

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