From a9b7639d4273bb7b10da4475010b14eb6eb2c64b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 Nov 2022 11:16:19 +0100 Subject: [PATCH] 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 330b7d1c13..28e05ad420 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -551,15 +551,19 @@ (define-public sdl2-ttf (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