diff mbox

[1/3] gnu: mkfontdir: Do not propagate 'mkfontscale'.

Message ID 20160701092730.2265-2-alezost@gmail.com
State New
Headers show

Commit Message

Alex Kost July 1, 2016, 9:27 a.m. UTC
* gnu/packages/xorg.scm (mkfontdir)[propagated-inputs]: Move
'mkfontscale' to ...
[inputs]: ... here.
[arguments]: Add 'wrap-mkfontdir' phase.
---
 gnu/packages/xorg.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Comments

Ludovic Courtès July 2, 2016, 2:26 p.m. UTC | #1
Alex Kost <alezost@gmail.com> skribis:

> * gnu/packages/xorg.scm (mkfontdir)[propagated-inputs]: Move
> 'mkfontscale' to ...
> [inputs]: ... here.
> [arguments]: Add 'wrap-mkfontdir' phase.

LGTM!

Ludo’.
diff mbox

Patch

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 431c591..090f661 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4631,7 +4631,17 @@  protocol and arbitrary X extension protocol.")
           (base32
             "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"))))
     (build-system gnu-build-system)
-    (propagated-inputs
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'wrap-mkfontdir
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (wrap-program (string-append (assoc-ref outputs "out")
+                                          "/bin/mkfontdir")
+               `("PATH" ":" prefix
+                 (,(string-append (assoc-ref inputs "mkfontscale")
+                                  "/bin")))))))))
+    (inputs
       `(("mkfontscale" ,mkfontscale)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))