diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-12-22 03:52:16 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-12-25 07:19:59 +0100 |
| commit | 90f0791038fa51dcbff48e4f393449c7d6c458f7 (patch) | |
| tree | 7a5ff9ef9e1a212b64fd485a3ef903efa7b0c87f /gnu | |
| parent | f2f2d3010a5e2dcb13321344ec604f9bc3d88d2d (diff) | |
| download | guix-90f0791038fa51dcbff48e4f393449c7d6c458f7.tar.gz | |
gnu: ndctl: Gexp arguments.
* gnu/packages/disk.scm (ndctl)[arguments]: Rewrite as a keyword/gexp list and move to the conventional location.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/disk.scm | 40 |
1 files changed, 20 insertions, 20 deletions
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 @@ #: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 @@ passphrases.") (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 @@ passphrases.") 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 |