diff mbox series

[bug#42625,2/2] gnu: wxwidgets: Fix MIME type loading.

Message ID 20200731032145.23092-1-kkebreau@posteo.net
State Accepted
Headers show
Series [bug#42625,1/2] gnu: wxmaxima: Update to 20.06.6. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job

Commit Message

Kei Kebreau July 31, 2020, 3:21 a.m. UTC 
* gnu/packages/wxwidgets.scm (wxwidgets)[inputs]: Add shared-mime-info.
[arguments]: Update 'refer-to-inputs phase so wxWidgets looks in the correct
directory for MIME type information.
---
 gnu/packages/wxwidgets.scm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Comments

Kei Kebreau Aug. 16, 2020, 9:33 p.m. UTC | #1 
Pushed to master as commits e79fe4f675 and 93d9737d2b.
diff mbox series

Patch

diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index 7141b2f4b8..f3a7fdd7a4 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -37,6 +37,7 @@ 
   #:use-module (gnu packages databases)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
@@ -75,6 +76,7 @@ 
        ("mesa" ,mesa)
        ("webkitgtk" ,webkitgtk)
        ("sdl" ,sdl)
+       ("shared-mime-info" ,shared-mime-info)
        ("xdg-utils" ,xdg-utils)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
@@ -97,11 +99,15 @@ 
        #: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)))))
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let* ((mime (string-append (assoc-ref inputs "shared-mime-info")
+                                         "/share/mime")))
+               (substitute* "src/unix/utilsx11.cpp"
+                 (("wxExecute\\(xdg_open \\+")
+                  (string-append "wxExecute(\"" (which "xdg-open") "\"")))
+               (substitute* "src/unix/mimetype.cpp"
+                 (("/usr(/local)?/share/mime") mime))
+               #t))))))
     (home-page "https://www.wxwidgets.org/")
     (synopsis "Widget toolkit for creating graphical user interfaces")
     (description