summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-11-26 11:16:19 +0100
committerMarius Bakke <marius@gnu.org>2022-11-26 14:56:34 +0100
commit2e68be4ca88368c94b1eb1123ef437605b7b904f (patch)
treef610536e32927f8ce9e143688ac569cb79d97ec0
parentfe6b44da637c3dc1efd534bfb4e614a1734cfe04 (diff)
downloadguix-2e68be4ca88368c94b1eb1123ef437605b7b904f.tar.gz
gnu: sdl2-ttf: Fix source snippet.
* gnu/packages/sdl.scm (sdl2-ttf)[source](snippet): Actually delete bundled
libraries.
[arguments]: New field.
[propagated-inputs]: Add FREETYPE and HARFBUZZ.
-rw-r--r--gnu/packages/sdl.scm14
1 files changed, 9 insertions, 5 deletions
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 4c9bb1b8a6..a0c8b92234 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -551,15 +551,19 @@ directory.")
               (string-append "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-"
                              version ".tar.gz"))
              (modules '((guix build utils)))
-             (snippet (begin
-                        ;; Remove bundled libraries.
-                        '(delete-file-recursively "external")
-                        #t))
+             (snippet
+              ;; Remove bundled libraries.
+              '(delete-file-recursively "external"))
              (sha256
               (base32
                "0mqcgpcvzp927xv1gs51f2wqly9k9f8nxfxi69lxlfncyd8svkbq"))))
+    (arguments
+     (list #:configure-flags #~'("--enable-freetype-builtin=no"
+                                 "--enable-harfbuzz-builtin=no")))
     (propagated-inputs
-     (propagated-inputs-with-sdl2 sdl-ttf))
+     (modify-inputs (propagated-inputs-with-sdl2 sdl-ttf)
+       ;; In Requires.private of SDL2_ttf.pc.
+       (prepend harfbuzz freetype)))
     (properties '((upstream-name . "SDL2_ttf")))))
 
 (define-public guile-sdl