futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: Paper over a build circularity problem.

Browse Source 
A forthcoming gtk+ update that will import (gnu packages gl) from
(gnu packages gtk) triggers an issue related to circular dependencies
between modules.  This patch works around the issue.

* gnu/packages/sdl.scm: Remove the #:prefix from the (gnu packages fontutils)
  import, and instead #:hide 'freetype' from the (guix licenses) import.

Modified-By: Mark H Weaver <mhw@netris.org>
This commit is contained in:
Andy Wingo 2015-04-05 20:25:30 +02:00 committed by Mark H Weaver
parent 347f54ed33
commit d16c9fd80f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/sdl.scm
View File

@ -20,12 +20,12 @@
(define-module (gnu packages sdl)
#:use-module (gnu packages)
#:use-module (guix licenses)
#:use-module ((guix licenses) #:hide (freetype))
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module ((gnu packages fontutils) #:prefix font:)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages guile)
#:use-module (gnu packages image)
#:use-module (gnu packages linux)
@ -260,7 +260,7 @@ SDL.")
"1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j"))))
(build-system gnu-build-system)
(propagated-inputs `(("sdl" ,sdl)))
(inputs `(("freetype" ,font:freetype)
(inputs `(("freetype" ,freetype)
("mesa" ,mesa)))
(native-inputs `(("pkg-config" ,pkg-config)))
(synopsis "SDL TrueType font library")