From 948200832108311f4f6876b1ab60b098bbcb742d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Mar 2020 15:25:58 +0100 Subject: gnu: wxwidgets: Refer to xdg-open. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/wxwidgets.scm (wxwidgets)[inputs]: Add xdg-utils. [arguments]: Add ‘refer-to-inputs’ phase to patch xdg-open calls. --- gnu/packages/wxwidgets.scm | 16 +++++++++++++--- 1 file 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 ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Arun Isaac ;;; ;;; 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 -- cgit v1.2.3