unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Leo Famulari <leo@famulari.name>
To: Martin Becze <mjbecze@riseup.net>
Cc: 44958@debbugs.gnu.org
Subject: [bug#44958] [PATCH 2/2] gnu: nicotine: Update to 2.1.2.
Date: Mon, 30 Nov 2020 12:21:34 -0500	[thread overview]
Message-ID: <X8UqHjADTki62D8J@jasmine.lan> (raw)
In-Reply-To: <20201130105047.8755-2-mjbecze@riseup.net>

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.




  reply	other threads:[~2020-11-30 17:22 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-30 10:47 [bug#44958] [PATCH 0/2] Update Nicotine to 2.1.2 Martin Becze
2020-11-30 10:50 ` [bug#44958] [PATCH 1/2] gnu: Add python-pytaglib Martin Becze
2020-11-30 10:50   ` [bug#44958] [PATCH 2/2] gnu: nicotine: Update to 2.1.2 Martin Becze
2020-11-30 17:21     ` Leo Famulari [this message]
2020-11-30 17:11   ` [bug#44958] [PATCH 1/2] gnu: Add python-pytaglib Leo Famulari
2020-11-30 17:24   ` Leo Famulari
2020-11-30 17:29     ` Martin Becze
2020-11-30 17:35       ` Leo Famulari
2020-11-30 17:25 ` bug#44958: [PATCH 0/2] Update Nicotine to 2.1.2 Leo Famulari

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=X8UqHjADTki62D8J@jasmine.lan \
    --to=leo@famulari.name \
    --cc=44958@debbugs.gnu.org \
    --cc=mjbecze@riseup.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).