From f1fdde3c4504d6e4ffddeff94f69c3f07ed13b2f Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Tue, 28 Jun 2022 20:41:37 +0200 Subject: [PATCH] gnu: gst-plugins/selection: Implement in terms of G-Expressions. * gnu/packages/gstreamer.scm (gst-plugins/selection)[#:configure-flags]: Use G-Expressions. [#:phases]: Likewise. Drop trailing #t. * gnu/packages/video.scm (pitivi)[inputs]: Adjust accordingly. --- gnu/packages/gstreamer.scm | 26 +++++++++++++------------- gnu/packages/video.scm | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index d6612a2d0b..d58db086af 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -29,6 +29,7 @@ (define-module (gnu packages gstreamer) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) @@ -1035,20 +1036,19 @@ (define-public gst-plugins/selection (package/inherit pkg (arguments (substitute-keyword-arguments (package-arguments pkg) - ((#:configure-flags flags `(,@(or configure-flags '()))) - `(append + ((#:configure-flags flags #~'()) + #~(append (list - ,@(map (lambda (plugin) - (string-append "-D" plugin "=enabled")) - plugins)) - (list ,@(or configure-flags flags)))) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'disable-auto-plugins - (lambda _ - (substitute* "meson_options.txt" - (("'auto'") "'disabled'")) - #t))))))))) + #$@(map (lambda (plugin) + (string-append "-D" plugin "=enabled")) + plugins)) + #$(or configure-flags flags))) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'disable-auto-plugins + (lambda _ + (substitute* "meson_options.txt" + (("'auto'") "'disabled'"))))))))))) (define-public python-gst (package diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5600baf638..49cd38687a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4353,7 +4353,7 @@ (define-public pitivi (gst-plugins/selection gst-plugins-bad #:plugins '("debugutils" "transcode") #:configure-flags - '("-Dintrospection=enabled")) + #~'("-Dintrospection=enabled")) gst-libav gsound gtk+