ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-26 20:49:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: wxwidgets-3.1: Update to 3.1.5.

Browse source 
* gnu/packages/wxwidgets.scm (wxwidgets-3.1): Update to 3.1.5.
[inputs]: Add catch-framework.
[#:configure-flags]: List out all flags.
[#:phases]: Add ‘add-catch’ phase.
Replace ‘configure’ with manual configuration.
This commit is contained in:
Liliana Marie Prikler 2021-12-30 15:23:51 +01:00
parent 2c9f13ba63
commit 4ff6b34026
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gnu/packages/wxwidgets.scm
View file

@ -26,6 +26,7 @@
(define-module (gnu packages wxwidgets) (define-module (gnu packages wxwidgets)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix l:) #:use-module ((guix licenses) #:prefix l:)
@ -33,6 +34,7 @@ (define-module (gnu packages wxwidgets)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
@ -162,7 +164,7 @@ (define-public wxwidgets-gtk2
;; This can be removed when wxWidgets is updated to the next stable version. ;; This can be removed when wxWidgets is updated to the next stable version.
(define-public wxwidgets-3.1 (define-public wxwidgets-3.1
(package (inherit wxwidgets) (package (inherit wxwidgets)
(version "3.1.0") (version "3.1.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -172,13 +174,32 @@ (define-public wxwidgets-3.1
(file-name (git-file-name "wxwidgets" version)) (file-name (git-file-name "wxwidgets" version))
(sha256 (sha256
(base32 (base32
"14kl1rsngm70v3mbyv1mal15iz2b18k97avjx8jn7s81znha1c7f")))) "0j998nzqmycafignclxmahgqm5kgs1fiqbsiyvzm7bnpnafi333y"))))
(inputs (modify-inputs (package-inputs wxwidgets) (inputs (modify-inputs (package-inputs wxwidgets)
(prepend gstreamer gst-plugins-base))) (prepend catch-framework gstreamer gst-plugins-base)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments wxwidgets) (substitute-keyword-arguments (package-arguments wxwidgets)
((#:configure-flags flags) ((#:configure-flags flags)
`(cons "--enable-mediactrl" ,flags)))))) '(list "--with-regex" "--with-libmspack" "--with-sdl"
"--enable-mediactrl" "--enable-webviewwebkit"))
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'add-catch
(lambda* (#:key inputs #:allow-other-keys)
(install-file
(search-input-file inputs "include/catch.hpp")
"3rdparty/catch/include/")))
(replace 'configure
(lambda* (#:key configure-flags inputs native-inputs outputs
#:allow-other-keys)
(let ((sh (search-input-file (or native-inputs inputs)
"bin/sh")))
(apply invoke "./configure"
(string-append "SHELL=" sh)
(string-append "CONFIG_SHELL=" sh)
(string-append "--prefix="
(assoc-ref outputs "out"))
configure-flags))))))))))
(define-public wxwidgets-gtk2-3.1 (define-public wxwidgets-gtk2-3.1
(package/inherit wxwidgets-3.1 (package/inherit wxwidgets-3.1