diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-09-05 21:56:34 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-09-05 22:30:04 +0300 |
| commit | de3c03a47160dec355d9b19ad5ca210d90c15fd7 (patch) | |
| tree | 4ca6dc05b5fc9530d812bbb269f1c61ab9efccf3 /gnu/packages/wxwidgets.scm | |
| parent | ab6fe9d362046231ad6f46eccfd1ea2c9c80b401 (diff) | |
| parent | b8477cab7bccc4191ed3dfa3f149aec7917834d8 (diff) | |
| download | guix-patches-de3c03a47160dec355d9b19ad5ca210d90c15fd7.tar guix-patches-de3c03a47160dec355d9b19ad5ca210d90c15fd7.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/packages/wxwidgets.scm')
| -rw-r--r-- | gnu/packages/wxwidgets.scm | 16 |
1 files changed, 11 insertions, 5 deletions
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 |