me/guix
Archived
1
0
Fork 0
Code Activity

gnu: atop: Adjust build.

Browse source 
* gnu/packages/admin.scm (atop)[arguments]: Adjust custom 'patch-build
phase to remove references to '/usr' and adjust make-flags accordingly.
Remove trailing #t.
This commit is contained in:
Efraim Flashner 2022-05-17 10:59:36 +03:00
parent eab070a89d
commit 2d229578bd
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/admin.scm
View file

@ -4707,13 +4707,8 @@ Netgear devices.")
#:make-flags #:make-flags
(list (string-append "CC=" ,(cc-for-target)) (list (string-append "CC=" ,(cc-for-target))
(string-append "DESTDIR=" (assoc-ref %outputs "out")) (string-append "DESTDIR=" (assoc-ref %outputs "out"))
(string-append "BINPATH=/bin")
(string-append "SBINPATH=/sbin")
(string-append "SYSDPATH=/etc/systemd/system") (string-append "SYSDPATH=/etc/systemd/system")
(string-append "PMPATHD=/etc/systemd/system-sleep") (string-append "PMPATHD=/etc/systemd/system-sleep")
(string-append "MAN1PATH=/share/man/man1")
(string-append "MAN5PATH=/share/man/man5")
(string-append "MAN8PATH=/share/man/man8")
;; Or else it tries to create /var/log/atop... ;; Or else it tries to create /var/log/atop...
(string-append "LOGPATH=")) (string-append "LOGPATH="))
#:phases #:phases
@ -4722,10 +4717,11 @@ Netgear devices.")
(add-before 'build 'patch-build (add-before 'build 'patch-build
(lambda _ (lambda _
(substitute* "Makefile" (substitute* "Makefile"
;; Don't use /usr as a prefix
(("/usr") "")
;; Otherwise, it creates a blank configuration file as a "default". ;; Otherwise, it creates a blank configuration file as a "default".
(("touch.*DEFPATH)/atop") "") (("touch.*DEFPATH)/atop") "")
(("chmod.*DEFPATH)/atop") "")) (("chmod.*DEFPATH)/atop") "")))))))
#t)))))
(inputs (inputs
`(("ncurses" ,ncurses) `(("ncurses" ,ncurses)
("python" ,python-wrapper) ; for `atopgpud` ("python" ,python-wrapper) ; for `atopgpud`