1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-27 03:21:49 +02:00

Merge branch 'master' into staging

This commit is contained in:
Marius Bakke
2019-02-24 21:25:52 +01:00
49 changed files with 567 additions and 299 deletions
+16
View File
@@ -7,6 +7,7 @@
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -350,6 +351,21 @@ directory.")
(other other))
(package-propagated-inputs package)))
(define-public sdl2-gfx
(package (inherit sdl-gfx)
(name "sdl2-gfx")
(version "1.0.4")
(source (origin
(method url-fetch)
(uri
(string-append "https://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-"
version ".tar.gz"))
(sha256
(base32
"0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33"))))
(propagated-inputs
(propagated-inputs-with-sdl2 sdl-gfx))))
(define-public sdl2-image
(package (inherit sdl-image)
(name "sdl2-image")