aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2016-06-29 22:39:02 +0300
committerAlex Kost <alezost@gmail.com>2016-07-25 17:18:52 +0300
commit84b5d9075ca4cb22e1c8bd85b5eb24635ecf689e (patch)
treeae463b4044ebdad5c10168af21459cba818dc74f
parente48e31bcc8c62fbd1caf77a1c4958fc49ab5ff7f (diff)
downloadpatches-84b5d9075ca4cb22e1c8bd85b5eb24635ecf689e.tar
patches-84b5d9075ca4cb22e1c8bd85b5eb24635ecf689e.tar.gz
gnu: mkfontdir: Do not propagate 'mkfontscale'.
* gnu/packages/xorg.scm (mkfontdir)[propagated-inputs]: Move 'mkfontscale' to ... [inputs]: ... here. [arguments]: Add 'wrap-mkfontdir' phase.
-rw-r--r--gnu/packages/xorg.scm12
1 files changed, 11 insertions, 1 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 431c591315..090f6616c5 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)))