From 67c127c9cbef57d43f1aa73c50a87f0b1a1e17de Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Jul 2018 15:19:07 +0200 Subject: [PATCH] gnu: sfml: Remove all bundled dependencies. * gnu/packages/game-development.scm (sfml)[source](snippet): New field. [inputs]: Add STB-IMAGE and STB-IMAGE-WRITE. --- gnu/packages/game-development.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 4610e389bd..33e2b4a16c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -74,6 +74,7 @@ (define-module (gnu packages game-development) #:use-module (gnu packages python) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) + #:use-module (gnu packages stb) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages video) @@ -451,7 +452,13 @@ (define-public sfml (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab")))) + "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Ensure system libraries are used. + (delete-file-recursively "extlibs") + #t)))) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -468,7 +475,9 @@ (define-public sfml ("libxrandr" ,libxrandr) ("eudev" ,eudev) ("libjpeg" ,libjpeg) - ("libsndfile" ,libsndfile))) + ("libsndfile" ,libsndfile) + ("stb-image" ,stb-image) + ("stb-image-write" ,stb-image-write))) (propagated-inputs ;; In Requires.private of pkg-config files. `(("flac" ,flac)