From 9e1c255b35a16c408fbd408c6690af6c30ea9180 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Oct 2022 10:09:07 +0200 Subject: gnu: weston: Use G-expression. * gnu/packages/freedesktop.scm (weston)[arguments]: Use gexp to remove references to %outputs and %build-inputs. --- gnu/packages/freedesktop.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 109b7664d1..ab37f04bef 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1209,22 +1209,23 @@ (define-public weston (propagated-inputs (list libxkbcommon pixman wayland)) (arguments - `(#:configure-flags - (list - ;; Otherwise, the RUNPATH will lack the final path component. - (string-append "-Dc_link_args=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib:" - (assoc-ref %outputs "out") "/lib/weston:" - (assoc-ref %outputs "out") "/lib/libweston-" - ,(version-major (package-version this-package))) - "-Dbackend-default=auto" - "-Dsystemd=false" - (string-append "-Dxwayland-path=" - (assoc-ref %build-inputs "xorg-server-xwayland") - "/bin/Xwayland")) - #:parallel-tests? #f ; Parallel tests cause failures. - #:phases - (modify-phases %standard-phases + (list + #:configure-flags + #~(list + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=-Wl,-rpath=" + #$output "/lib:" + #$output "/lib/weston:" + #$output "/lib/libweston-" + #$(version-major (package-version this-package))) + "-Dbackend-default=auto" + "-Dsystemd=false" + (string-append "-Dxwayland-path=" + #$(this-package-input "xorg-server-xwayland") + "/bin/Xwayland")) + #:parallel-tests? #f ; Parallel tests cause failures. + #:phases + '(modify-phases %standard-phases (add-before 'configure 'use-elogind (lambda _ ;; Use elogind instead of systemd -- cgit v1.2.3