[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Fix circularity issue in sdl
From: |
Andy Wingo |
Subject: |
[PATCH] Fix circularity issue in sdl |
Date: |
Mon, 06 Apr 2015 10:32:22 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) |
>From 0eccb8e5f24964439b76adbf3ab318c87f7443d2 Mon Sep 17 00:00:00 2001
From: Andy Wingo <address@hidden>
Date: Sun, 5 Apr 2015 20:25:30 +0200
Subject: [PATCH] gnu: sdl: Paper over build circularity problem with fontutils
* gnu/packages/sdl.scm: Horrifically, having the font: prefix on
fontutils makes "guix package --search=" fail, now that there is an
edge that goes from gtk -> gl -> fontutils -> gtk, whereas before
there was just gtk -> fontutils -> gtk. Remove the #:prefix and
instead #:prefix the licenses import, to disambiguate the freetype
binding. Terrible.
---
gnu/packages/sdl.scm | 6 +++---
1 file 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")
--
2.2.1
--
http://wingolog.org/
- [PATCH] Fix circularity issue in sdl,
Andy Wingo <=