From patchwork Fri Jul 31 03:21:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 23463 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C2CA527BBE3; Fri, 31 Jul 2020 04:23:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 592E527BBE1 for ; Fri, 31 Jul 2020 04:23:09 +0100 (BST) Received: from localhost ([::1]:59044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1LdU-0000I5-SE for patchwork@mira.cbaines.net; Thu, 30 Jul 2020 23:23:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1LdO-0000F5-PM for guix-patches@gnu.org; Thu, 30 Jul 2020 23:23:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53766) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k1LdO-0001ap-EF for guix-patches@gnu.org; Thu, 30 Jul 2020 23:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k1LdO-0005zz-Ai for guix-patches@gnu.org; Thu, 30 Jul 2020 23:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42625] [PATCH 2/2] gnu: wxwidgets: Fix MIME type loading. References: <20200731032038.23036-1-kkebreau@posteo.net> In-Reply-To: <20200731032038.23036-1-kkebreau@posteo.net> Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Jul 2020 03:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42625 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42625@debbugs.gnu.org Cc: Kei Kebreau Received: via spool by 42625-submit@debbugs.gnu.org id=B42625.159616572322975 (code B ref 42625); Fri, 31 Jul 2020 03:23:02 +0000 Received: (at 42625) by debbugs.gnu.org; 31 Jul 2020 03:22:03 +0000 Received: from localhost ([127.0.0.1]:37079 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k1LcR-0005yV-Ab for submit@debbugs.gnu.org; Thu, 30 Jul 2020 23:22:03 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k1LcP-0005xr-La for 42625@debbugs.gnu.org; Thu, 30 Jul 2020 23:22:02 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id BADBF16005C for <42625@debbugs.gnu.org>; Fri, 31 Jul 2020 05:21:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1596165715; bh=DiC6aeVBFSvVq/6WODybUshuKsZ0+vnP29tjIvTlFnM=; h=From:To:Cc:Subject:Date:From; b=lwuD1KU2Y0S3wS1n47L5pr5MJFren5olNgaZL5qEFhfrGlhiFmgtvsGStKOscinaA TBgNUWH4TkKEwdAZccvR1gf5v1MT83Hyeif+yQbjQh1/4PhlNlyIYEAEKsbChsvnmu zJ12mT4K1O5d6B2rvRqgrYV+2caDeG6fDdvKylU1Ixk6xf8ylbgDeMUCgjXekOkBy/ i9RqBleHFTPw5JuKH32aU2Yk2+wG4cH3AeYci/2xBpP4W0SaYAx0CyIh1YhJCcUp7p JmjQZS/h2JU3cew04KsJZRFMYszP48qZR+awgp8yCKNVbDkN68jzgsp46E8oQ3+S6N b9V1B3/2RnCrg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4BHsyT4Wvyz9rxW; Fri, 31 Jul 2020 05:21:53 +0200 (CEST) From: Kei Kebreau Date: Thu, 30 Jul 2020 23:21:45 -0400 Message-Id: <20200731032145.23092-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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(-) 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