Hi!
ng0 <n...@libertad.pw> skribis:
> * gnu/packages/networking.scm (whois): Move mkpasswd to output "mkpasswd".
> [outputs]: Add "mkpasswd".
> [arguments]: Add new phase "move-mkpasswd".
> Remove TODO comment about unbundling.
> ---
> gnu/packages/networking.scm | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
> index 3c7c07349..03165e62d 100644
> --- a/gnu/packages/networking.scm
> +++ b/gnu/packages/networking.scm
> @@ -8,7 +8,7 @@
> ;;; Copyright © 2016 John Darrington <j...@gnu.org>
> ;;; Copyright © 2016 Nicolas Goaziou <m...@nicolasgoaziou.fr>
> ;;; Copyright © 2016 Eric Bavier <bav...@member.fsf.org>
> -;;; Copyright © 2016 ng0 <n...@we.make.ritual.n0.is>
> +;;; Copyright © 2016, 2017 ng0 <n...@libertad.pw>
> ;;; Copyright © 2016 Arun Isaac <arunis...@systemreboot.net>
> ;;; Copyright © 2016 Benz Schenk <benz.sch...@uzh.ch>
> ;;;
> @@ -440,7 +440,6 @@ and up to 1 Mbit/s downstream.")
> (base32
> "0r3bbxpwsxssa99d8dcjnp79mw1cjwqxgmqjm1537q277jwsk0yc"))))
> (build-system gnu-build-system)
> - ;; TODO: unbundle mkpasswd binary + its po files.
> (arguments
> `(#:tests? #f ; Does not exist
> #:make-flags (list "CC=gcc"
> @@ -452,7 +451,21 @@ and up to 1 Mbit/s downstream.")
> (lambda _
> (setenv "HAVE_ICONV" "1")
> (setenv "HAVE_LIBIDN" "1")
> - #t)))))
> + #t))
> + (add-after 'install 'move-mkpasswd
> + (lambda* (#:key outputs #:allow-other-keys)
> + ;; Move mkpasswd related files to "mkpasswd".
> + (let ((out (assoc-ref outputs "out"))
> + (mp (assoc-ref outputs "mkpasswd")))
> + (mkdir-p (string-append mp "/share/man/man1"))
> + (mkdir-p (string-append mp "/bin"))
> + (rename-file (string-append out "/share/man/man1/mkpasswd.1")
> + (string-append mp "/share/man/man1/mkpasswd.1"))
> + (rename-file (string-append out "/bin/mkpasswd")
> + (string-append mp "/bin/mkpasswd"))
> + #t))))))
> + (outputs '("out"
> + "mkpasswd")) ; 28KiB binary, 16KiB man1
Why to you call that “unbundling”?
Also, I don’t find it useful to have a separate output just for a few
kilobytes. Could you explain?
Thanks,
Ludo’.
