guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

11/11: gnu: sdl2-ttf: Fix source snippet.


From: guix-commits
Subject: 11/11: gnu: sdl2-ttf: Fix source snippet.
Date: Sat, 26 Nov 2022 09:03:37 -0500 (EST)

mbakke pushed a commit to branch staging
in repository guix.

commit 2e68be4ca88368c94b1eb1123ef437605b7b904f
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Nov 26 11:16:19 2022 +0100

    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.
---
 gnu/packages/sdl.scm | 14 +++++++++-----
 1 file 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]