diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-18 19:41:08 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-18 19:41:08 +0100 |
commit | c4d769d359c67680fe55c3b71e659cd31837f3ec (patch) | |
tree | 928fe50be266c8975f4abad56e07ce4ebaef55fe /gnu/packages/wxwidgets.scm | |
parent | de2871c9faa44ee07f73470441f05d114a43bb48 (diff) | |
parent | 4de63cf3fc0a831d75cb507456821104f24800c2 (diff) | |
download | guix-c4d769d359c67680fe55c3b71e659cd31837f3ec.tar.gz guix-c4d769d359c67680fe55c3b71e659cd31837f3ec.zip |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/wxwidgets.scm')
-rw-r--r-- | gnu/packages/wxwidgets.scm | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index b48a116201..4fd1817c49 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net> ;;; ;;; This file is part of GNU Guix. @@ -35,6 +35,7 @@ #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages databases) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gl) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) @@ -73,7 +74,8 @@ ("libtiff" ,libtiff) ("mesa" ,mesa) ("webkitgtk" ,webkitgtk) - ("sdl" ,sdl))) + ("sdl" ,sdl) + ("xdg-utils" ,xdg-utils))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments @@ -91,7 +93,15 @@ (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) ;; No 'check' target. - #:tests? #f)) + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'refer-to-inputs + (lambda _ + (substitute* "src/unix/utilsx11.cpp" + (("wxExecute\\(xdg_open \\+") + (string-append "wxExecute(\"" (which "xdg-open") "\""))) + #t))))) (home-page "https://www.wxwidgets.org/") (synopsis "Widget toolkit for creating graphical user interfaces") (description |