diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 2d7c6797a1..365105a402 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -93,6 +93,7 @@ (define-module (gnu packages disk) #:use-module (guix build-system trivial) #:use-module (guix build-system scons) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -822,6 +823,25 @@ (define-public ndctl (base32 "1m9kmzqqy395p2zmcaspw2q5ailagi1xy47hkvjp3lfp48zcrpbi")))) (build-system gnu-build-system) + (arguments + (list #:configure-flags + #~(list "--disable-asciidoctor" ; use docbook-xsl instead + "--without-systemd") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-include + (lambda _ + (substitute* "util/parse-configs.c" + (("iniparser/") "")))) + (add-after 'unpack 'patch-FHS-file-names + (lambda _ + (substitute* "git-version-gen" + (("/bin/sh") (which "sh"))) + (substitute* "git-version" + (("/bin/bash") (which "bash")))))) + #:make-flags + #~(list (string-append "BASH_COMPLETION_DIR=" #$output + "/share/bash-completion/completions")))) (native-inputs (list asciidoc automake @@ -841,26 +861,6 @@ (define-public ndctl keyutils kmod `(,util-linux "lib"))) - (arguments - `(#:configure-flags - (list "--disable-asciidoctor" ; use docbook-xsl instead - "--without-systemd") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-include - (lambda _ - (substitute* "util/parse-configs.c" - (("iniparser/") "")))) - (add-after 'unpack 'patch-FHS-file-names - (lambda _ - (substitute* "git-version-gen" - (("/bin/sh") (which "sh"))) - (substitute* "git-version" - (("/bin/bash") (which "bash")))))) - #:make-flags - (let ((out (assoc-ref %outputs "out"))) - (list (string-append "BASH_COMPLETION_DIR=" out - "/share/bash-completion/completions"))))) (home-page "https://github.com/pmem/ndctl") (synopsis "Manage the non-volatile memory device sub-system in the Linux kernel") (description