From 8394619baceb118df92e355377fd543bb1aa501a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Dec 2021 17:18:24 +0100 Subject: gnu: Simplify package inputs. This commit was obtained by running: ./pre-inst-env guix style without any additional argument. --- gnu/packages/arcan.scm | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'gnu/packages/arcan.scm') diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 721cd7fd70..c25d64903c 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -151,8 +151,7 @@ (define-public arcan (base32 "0dcxcnqjkyyqdr2yk84mprvkncy5g172kfs6vc4zrkklsbkr8yi2")))))) (native-inputs - `(("pkg-config" ,pkg-config) - ("ruby" ,ruby))) ; For documentation and testing + (list pkg-config ruby)) ; For documentation and testing (home-page "https://arcan-fe.com") (synopsis "Display server, multimedia framework and game engine (egl-dri)") (description "Arcan is a development framework for creating virtually @@ -171,9 +170,9 @@ (define-public arcan-sdl (inherit arcan) (name "arcan-sdl") (inputs - `(("sdl" ,sdl) - ,@(fold alist-delete (package-inputs arcan) - '("libdrm")))) + (modify-inputs (package-inputs arcan) + (delete "libdrm") + (prepend sdl))) (arguments `(,@(ensure-keyword-arguments (package-arguments arcan) @@ -219,11 +218,7 @@ (define-public xarcan ,(string-append "--with-xkb-output=" "/tmp")))) ; FIXME: Copied from xorg (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("util-macros" ,util-macros))) + (list pkg-config autoconf automake libtool util-macros)) (inputs `(("arcan" ,arcan) ("font-util" ,font-util) @@ -251,14 +246,14 @@ (define-public arcan-wayland (inherit arcan) (name "arcan-wayland") (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (inputs - `(("arcan" ,arcan) - ("libseccomp" ,libseccomp) - ("libxkbcommon" ,libxkbcommon) - ("mesa" ,mesa) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + (list arcan + libseccomp + libxkbcommon + mesa + wayland + wayland-protocols)) (arguments `(#:tests? #f #:phases -- cgit v1.2.3