nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: proot: Use invoke. 

* gnu/packages/linux.scm (proot)[arguments]: Use invoke and remove vestigial
plumbing.
This commit is contained in:
Mark H Weaver 2018-03-16 02:21:49 -04:00
parent 8c3101b877
commit 06153a3089
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gnu/packages/linux.scm
View File

@ -4241,24 +4241,23 @@ userspace queueing component and the logging subsystem.")
(setenv "PATH" (setenv "PATH"
(string-append (getenv "PATH") ":/bin")) (string-append (getenv "PATH") ":/bin"))
(zero? (system* "make" "check" "-C" "tests" (invoke "make" "check" "-C" "tests"
;;"V=1" ;;"V=1"
"-j" (number->string n)))))) "-j" (number->string n)))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; The 'install' rule does nearly nothing. ;; The 'install' rule does nearly nothing.
(let ((out (assoc-ref outputs "out"))) (let* ((out (assoc-ref outputs "out"))
(and (zero? (man1 (string-append out "/share/man/man1")))
;; TODO: 'make install-care' (does not even ;; TODO: 'make install-care' (does not even
;; build currently.) ;; build currently.)
(system* "make" "-C" "src" "install" (invoke "make" "-C" "src" "install"
(string-append "PREFIX=" out))) (string-append "PREFIX=" out))
(let ((man1 (string-append out
"/share/man/man1"))) (mkdir-p man1)
(mkdir-p man1) (copy-file "doc/proot/man.1"
(copy-file "doc/proot/man.1" (string-append man1 "/proot.1"))
(string-append man1 "/proot.1")) #t))))))
#t))))))))
(native-inputs `(("which" ,which) (native-inputs `(("which" ,which)
;; For 'mcookie', used by some of the tests. ;; For 'mcookie', used by some of the tests.