From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kAGjNEYqxV9uPQAA0tVLHw (envelope-from ) for ; Mon, 30 Nov 2020 17:22:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id MBtmMEYqxV+kJgAAbx9fmQ (envelope-from ) for ; Mon, 30 Nov 2020 17:22:14 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 94AB8940538 for ; Mon, 30 Nov 2020 17:22:12 +0000 (UTC) Received: from localhost ([::1]:60500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjmsN-0004os-5A for larch@yhetil.org; Mon, 30 Nov 2020 12:22:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjmsE-0004nE-VT for guix-patches@gnu.org; Mon, 30 Nov 2020 12:22:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44988) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kjmsE-0001ey-Ls for guix-patches@gnu.org; Mon, 30 Nov 2020 12:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kjmsE-0005XO-Ep for guix-patches@gnu.org; Mon, 30 Nov 2020 12:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44958] [PATCH 2/2] gnu: nicotine: Update to 2.1.2. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Nov 2020 17:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44958 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Martin Becze Cc: 44958@debbugs.gnu.org Received: via spool by 44958-submit@debbugs.gnu.org id=B44958.160675690321258 (code B ref 44958); Mon, 30 Nov 2020 17:22:02 +0000 Received: (at 44958) by debbugs.gnu.org; 30 Nov 2020 17:21:43 +0000 Received: from localhost ([127.0.0.1]:56534 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjmrv-0005Wn-Gl for submit@debbugs.gnu.org; Mon, 30 Nov 2020 12:21:43 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:44319) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjmrt-0005Wb-MQ for 44958@debbugs.gnu.org; Mon, 30 Nov 2020 12:21:42 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 75A1B5C0093; Mon, 30 Nov 2020 12:21:36 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 30 Nov 2020 12:21:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=X5A5USY+Z9t/WG0YSmQYdCrf f7Eun8MLpY0hhAw5CXE=; b=vzPzQTkgzdDiPWHdPln0mH0qL+ColjwoKm2i2Fqo YKLuoeAlXN3BdTrKn7O5w4NornrTDGpUP9Dcb2swflvi8GvyPYRkhg609VDlQ572 Jdxn75S7oKSF4Ge25Oj5IiGxWOKSwa1NJ/rRbKc5lGnJuH0F/1eQLYQ2c1NS8KYZ lPg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=X5A5US Y+Z9t/WG0YSmQYdCrff7Eun8MLpY0hhAw5CXE=; b=Vk4aTPUb1WyaQjzsH558u7 DhyyLqE57+qmgDxGbrxtoLHw/bHeqw3C2c+qT5ovWT8pCCQGEYE3SFQOB7EmmmRB TfWq68SGOHCBP0XiIdxGZ/MFNhQ3O6Hpn6g72TTI8ZM8CE/W9b/i4y9b/OOrYDj+ kei92Q7X2ZxaPFDeP9JCnI3VDHGCZHwFczWeRI9SzoZIL1vcek91d24IiqJt3pDy HmlY0BSyXM8tptRDjaSgWTPeoZ06i7oaOe+vBfNhmNtWKUbaME1Te0MecNqSJJp3 zHHoUJgRzLSvBT8nyo/GjxOgGWWq4PnqcTioudMYSCWSc0udRqxymYTER51y2Mqg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudeitddgleelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne goufhushhpvggtthffohhmrghinhculdegledmnecujfgurhepfffhvffukfhfgggtuggj sehttdertddttddvnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrg hmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpedtueeuveffffelueejhedu gfdufefghffgvdeutdeuffduffelieefvdejhfeuheenucffohhmrghinhepghhithhhuh gsrdhiohenucfkphepjeefrddugedurdduvdejrddugeeinecuvehluhhsthgvrhfuihii vgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrg hmvg X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id E41B13064AAA; Mon, 30 Nov 2020 12:21:35 -0500 (EST) Date: Mon, 30 Nov 2020 12:21:34 -0500 From: Leo Famulari Message-ID: References: <20201130104752.8601-1-mjbecze@riseup.net> <20201130105047.8755-1-mjbecze@riseup.net> <20201130105047.8755-2-mjbecze@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201130105047.8755-2-mjbecze@riseup.net> 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.28 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=famulari.name header.s=mesmtp header.b=vzPzQTkg; dkim=fail (headers rsa verify failed) header.d=messagingengine.com header.s=fm1 header.b=Vk4aTPUb; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 94AB8940538 X-Spam-Score: -1.28 X-Migadu-Scanner: ns3122888.ip-94-23-21.eu X-TUID: fb7WkKOSAfAi On Mon, Nov 30, 2020 at 04:50:47AM -0600, Martin Becze wrote: > * gnu/packages/nicotine.scm (nicotine+): Update to 2.1.2. Awesome, thanks for keeping up with this package! I noticed that on my Debian system, Nicotine would crash when I tried to open the "settings" window, with this message: ------ (.nicotine-real:20767): GLib-GIO-ERROR **: 12:12:44.338: Settings schema 'org.gtk.Settings.FileChooser' is not installed ------ I guessed it needed some of the special wrappers from the GLib / GTK+ build systems, so I used them by applying this diff to your patch: ------ diff --git a/gnu/packages/nicotine.scm b/gnu/packages/nicotine.scm index 5dc39334eb..7d937c11e5 100644 --- a/gnu/packages/nicotine.scm +++ b/gnu/packages/nicotine.scm @@ -40,7 +40,13 @@ (sha256 (base32 "18rra8yqjr10z23chzcp53ncbd5fhm0iqgqxpbxfq7a10za02v6l")))) (build-system python-build-system) (arguments - '(#:phases + `(#:imported-modules ((guix build glib-or-gtk-build-system) + ,@%python-build-system-modules) + #:modules + ((guix build utils) + (guix build python-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)) + #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program (lambda* (#:key outputs #:allow-other-keys) @@ -50,14 +56,19 @@ (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) (wrap-program prog `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))) - #t)))))) + #t))) + (add-after 'wrap-program 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) + (add-after 'glib-or-gtk-wrap 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + ))) (inputs - `(("python-pygobject" ,python-pygobject) + `(("gtk+" ,gtk+) + ("python-pygobject" ,python-pygobject) ("python-pytaglib" ,python-pytaglib))) (native-inputs `(("python-pytest" ,python-pytest) - ("gettext" ,gnu-gettext) - ("gtk+" ,gtk+))) + ("gettext" ,gnu-gettext))) (home-page "https://nicotine-plus.github.io/nicotine-plus/") (synopsis "Graphical client for Soulseek") (description ------ I also moved the GTK+ input from native-inputs to inputs, since it is referred to by the built Nicotine+ package. Native-inputs are for packages that are only used while building, but we can expect GTK+ to be used at run-time for this package. And I swapped out gnu-gettext for gettext-minimal, to avoid depending on Emacs.