[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: gnu: Paper over a build circularity problem.
From: |
Mark H. Weaver |
Subject: |
01/03: gnu: Paper over a build circularity problem. |
Date: |
Mon, 06 Apr 2015 22:51:42 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit d16c9fd80fd094ee03135ba8db281022e1b1ab9a
Author: Andy Wingo <address@hidden>
Date: Sun Apr 5 20:25:30 2015 +0200
gnu: Paper over a build circularity problem.
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 <address@hidden>
---
gnu/packages/sdl.scm | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 9a3b389..4e9ebfb 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -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")