ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ndctl: Gexp arguments.

Browse source 
* gnu/packages/disk.scm (ndctl)[arguments]: Rewrite as a keyword/gexp
list and move to the conventional location.
This commit is contained in:
Tobias Geerinckx-Rice 2021-12-22 03:52:16 +01:00
parent f2f2d3010a
commit 90f0791038
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
gnu/packages/disk.scm
View file

@ -93,6 +93,7 @@ (define-module (gnu packages disk)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix build-system scons) #:use-module (guix build-system scons)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
@ -822,6 +823,25 @@ (define-public ndctl
(base32 (base32
"1m9kmzqqy395p2zmcaspw2q5ailagi1xy47hkvjp3lfp48zcrpbi")))) "1m9kmzqqy395p2zmcaspw2q5ailagi1xy47hkvjp3lfp48zcrpbi"))))
(build-system gnu-build-system) (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 (native-inputs
(list asciidoc (list asciidoc
automake automake
@ -841,26 +861,6 @@ (define-public ndctl
keyutils keyutils
kmod kmod
`(,util-linux "lib"))) `(,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") (home-page "https://github.com/pmem/ndctl")
(synopsis "Manage the non-volatile memory device sub-system in the Linux kernel") (synopsis "Manage the non-volatile memory device sub-system in the Linux kernel")
(description (description