diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-03-16 15:25:58 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-03-16 16:32:43 +0100 |
| commit | 948200832108311f4f6876b1ab60b098bbcb742d (patch) | |
| tree | a6251c8b5be625e069b064f952b97a554560efcb | |
| parent | 8317c89aa3573f4a597fc0b2eaf08769239c5e37 (diff) | |
| download | guix-948200832108311f4f6876b1ab60b098bbcb742d.tar guix-948200832108311f4f6876b1ab60b098bbcb742d.tar.gz | |
gnu: wxwidgets: Refer to xdg-open.
Fixes <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=22704>.
* gnu/packages/wxwidgets.scm (wxwidgets)[inputs]: Add xdg-utils.
[arguments]: Add ‘refer-to-inputs’ phase to patch xdg-open calls.
| -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 5a2ea1c88e..49b190b9df 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 |