diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-05-17 12:29:08 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-05-17 12:38:32 +0300 |
| commit | ef55192ef8a0d9bd336731350f73b709ffd101a0 (patch) | |
| tree | 854e36c3cfdad4a293920da911769fbf05fd977b | |
| parent | 2d229578bd50b7137603ff14ce5588784a6c07b9 (diff) | |
| download | guix-patches-ef55192ef8a0d9bd336731350f73b709ffd101a0.tar guix-patches-ef55192ef8a0d9bd336731350f73b709ffd101a0.tar.gz | |
gnu: atop: Use new package format.base-for-series-12393base-for-series-12392
* gnu/packages/admin.scm (atop)[arguments]: Rewrite using g-exps.
[inputs]: Remove input labels.
| -rw-r--r-- | gnu/packages/admin.scm | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 30f51ef4b3..363f26ed0c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4703,29 +4703,30 @@ Netgear devices.") "0kjwgf94skbrndv1krlmsrq34smzi3iwk73fbsnyw787gvqx4j6a")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no test suite + (list + #:tests? #f ; no test suite #:make-flags - (list (string-append "CC=" ,(cc-for-target)) - (string-append "DESTDIR=" (assoc-ref %outputs "out")) - (string-append "SYSDPATH=/etc/systemd/system") - (string-append "PMPATHD=/etc/systemd/system-sleep") - ;; Or else it tries to create /var/log/atop... - (string-append "LOGPATH=")) + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "DESTDIR=" #$output) + (string-append "SYSDPATH=/etc/systemd/system") + (string-append "PMPATHD=/etc/systemd/system-sleep") + ;; Or else it tries to create /var/log/atop... + (string-append "LOGPATH=")) #:phases - (modify-phases %standard-phases - (delete 'configure) ; No ./configure script - (add-before 'build 'patch-build - (lambda _ - (substitute* "Makefile" - ;; Don't use /usr as a prefix - (("/usr") "") - ;; Otherwise, it creates a blank configuration file as a "default". - (("touch.*DEFPATH)/atop") "") - (("chmod.*DEFPATH)/atop") ""))))))) + #~(modify-phases %standard-phases + (delete 'configure) ; No ./configure script + (add-before 'build 'patch-build + (lambda _ + (substitute* "Makefile" + ;; Don't use /usr as a prefix. + (("/usr") "") + ;; Otherwise, it creates a blank configuration file as a "default". + (("touch.*DEFPATH)/atop") "") + (("chmod.*DEFPATH)/atop") ""))))))) (inputs - `(("ncurses" ,ncurses) - ("python" ,python-wrapper) ; for `atopgpud` - ("zlib" ,zlib))) + (list ncurses + python-wrapper ; for `atopgpud` + zlib)) (home-page "https://www.atoptool.nl/") (synopsis "Linux performance monitoring console") (description "Atop is an ASCII full-screen performance monitor for Linux |