From fa005d8a5b3fc5d6a2d057fd7af325f6a1279370 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Jul 2023 02:00:02 +0200 Subject: [PATCH] gnu: osinfo-db: Use G-expressions. * gnu/packages/virtualization.scm (osinfo-db)[arguments]: Rewrite as G-expressions. --- gnu/packages/virtualization.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 7dd52839b4..3f6c32f390 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -2475,18 +2475,18 @@ (define-public osinfo-db (base32 "0nl4wh8i9skcg1wx84p31x7rl1xv1267g5ycbn9kfwfnqxzwkl8k")))) (build-system trivial-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let* ((out (assoc-ref %outputs "out")) - (osinfo-dir (string-append out "/share/osinfo")) + (list + #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) + (let ((osinfo (string-append #$output "/share/osinfo")) (source (assoc-ref %build-inputs "source")) - (osinfo-db-import - (string-append (assoc-ref %build-inputs "osinfo-db-tools") + (import-osinfo-db + (string-append #$(this-package-native-input "osinfo-db-tools") "/bin/osinfo-db-import"))) - (mkdir-p osinfo-dir) - (invoke osinfo-db-import "--dir" osinfo-dir source))))) + (mkdir-p osinfo) + (invoke import-osinfo-db "--dir" osinfo source))))) (native-inputs (list intltool osinfo-db-tools)) (home-page "https://gitlab.com/libosinfo/osinfo-db")