gnu: xorg: Install fonts into package output instead of into font-util.
* gnu/packages/xorg.scm (font-adobe100dpi, font-adobe75dpi, font-misc-misc,
    font-schumacher-misc): Add configure flag to modify FONTROOTDIR.
			
			
This commit is contained in:
		
							parent
							
								
									9c2ecede41
								
							
						
					
					
						commit
						755693a42d
					
				
					 1 changed files with 14 additions and 0 deletions
				
			
		| 
						 | 
					@ -384,6 +384,11 @@ tracking.")
 | 
				
			||||||
        ("font-util", font-util)
 | 
					        ("font-util", font-util)
 | 
				
			||||||
        ("mkfontdir" ,mkfontdir)
 | 
					        ("mkfontdir" ,mkfontdir)
 | 
				
			||||||
        ("pkg-config" ,pkg-config)))
 | 
					        ("pkg-config" ,pkg-config)))
 | 
				
			||||||
 | 
					    (arguments
 | 
				
			||||||
 | 
					      `(#:configure-flags (list
 | 
				
			||||||
 | 
					        ;; install fonts into subdirectory of package output instead of
 | 
				
			||||||
 | 
					        ;; font-util-?.?.?/share/fonts/X11
 | 
				
			||||||
 | 
					        (string-append "--with-fontrootdir=" %output "/share/fonts/X11"))))
 | 
				
			||||||
    (home-page "http://www.x.org/wiki/")
 | 
					    (home-page "http://www.x.org/wiki/")
 | 
				
			||||||
    (synopsis "xorg implementation of the X Window System")
 | 
					    (synopsis "xorg implementation of the X Window System")
 | 
				
			||||||
    (description "X.org provides an implementation of the X Window System")
 | 
					    (description "X.org provides an implementation of the X Window System")
 | 
				
			||||||
| 
						 | 
					@ -410,6 +415,9 @@ tracking.")
 | 
				
			||||||
        ("font-util", font-util)
 | 
					        ("font-util", font-util)
 | 
				
			||||||
        ("mkfontdir" ,mkfontdir)
 | 
					        ("mkfontdir" ,mkfontdir)
 | 
				
			||||||
        ("pkg-config" ,pkg-config)))
 | 
					        ("pkg-config" ,pkg-config)))
 | 
				
			||||||
 | 
					    (arguments
 | 
				
			||||||
 | 
					      `(#:configure-flags (list
 | 
				
			||||||
 | 
					        (string-append "--with-fontrootdir=" %output "/share/fonts/X11"))))
 | 
				
			||||||
    (home-page "http://www.x.org/wiki/")
 | 
					    (home-page "http://www.x.org/wiki/")
 | 
				
			||||||
    (synopsis "xorg implementation of the X Window System")
 | 
					    (synopsis "xorg implementation of the X Window System")
 | 
				
			||||||
    (description "X.org provides an implementation of the X Window System")
 | 
					    (description "X.org provides an implementation of the X Window System")
 | 
				
			||||||
| 
						 | 
					@ -1004,6 +1012,9 @@ tracking.")
 | 
				
			||||||
        ("font-util" ,font-util)
 | 
					        ("font-util" ,font-util)
 | 
				
			||||||
        ("bdftopcf" ,bdftopcf)
 | 
					        ("bdftopcf" ,bdftopcf)
 | 
				
			||||||
        ("pkg-config" ,pkg-config)))
 | 
					        ("pkg-config" ,pkg-config)))
 | 
				
			||||||
 | 
					    (arguments
 | 
				
			||||||
 | 
					      `(#:configure-flags (list
 | 
				
			||||||
 | 
					        (string-append "--with-fontrootdir=" %output "/share/fonts/X11"))))
 | 
				
			||||||
    (home-page "http://www.x.org/wiki/")
 | 
					    (home-page "http://www.x.org/wiki/")
 | 
				
			||||||
    (synopsis "xorg implementation of the X Window System")
 | 
					    (synopsis "xorg implementation of the X Window System")
 | 
				
			||||||
    (description "X.org provides an implementation of the X Window System")
 | 
					    (description "X.org provides an implementation of the X Window System")
 | 
				
			||||||
| 
						 | 
					@ -1055,6 +1066,9 @@ tracking.")
 | 
				
			||||||
        ("font-util" ,font-util)
 | 
					        ("font-util" ,font-util)
 | 
				
			||||||
        ("bdftopcf" ,bdftopcf)
 | 
					        ("bdftopcf" ,bdftopcf)
 | 
				
			||||||
        ("pkg-config" ,pkg-config)))
 | 
					        ("pkg-config" ,pkg-config)))
 | 
				
			||||||
 | 
					    (arguments
 | 
				
			||||||
 | 
					      `(#:configure-flags (list
 | 
				
			||||||
 | 
					        (string-append "--with-fontrootdir=" %output "/share/fonts/X11"))))
 | 
				
			||||||
    (home-page "http://www.x.org/wiki/")
 | 
					    (home-page "http://www.x.org/wiki/")
 | 
				
			||||||
    (synopsis "xorg implementation of the X Window System")
 | 
					    (synopsis "xorg implementation of the X Window System")
 | 
				
			||||||
    (description "X.org provides an implementation of the X Window System")
 | 
					    (description "X.org provides an implementation of the X Window System")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue