From d6c4a436d7de43e88ccc67ceaee7c5caea9cd871 Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Mon, 30 Nov 2020 04:50:47 -0600 Subject: gnu: nicotine: Update to 2.1.2. * gnu/packages/nicotine.scm (nicotine+): Update to 2.1.2. [inputs]: Remove python-mutagen and python-dbus. Add python-pytaglib. [native-inputs]: Add gettext-minimal. [arguments]: Apply the 'glib-or-gtk-wrap' and 'glib-or-gtk-compile-schemas' phases from the glib-or-gtk-build-system. Signed-off-by: Leo Famulari --- gnu/packages/nicotine.scm | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nicotine.scm b/gnu/packages/nicotine.scm index dee2917c49..c6e99b3dbd 100644 --- a/gnu/packages/nicotine.scm +++ b/gnu/packages/nicotine.scm @@ -21,26 +21,32 @@ #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system python) - #:use-module (gnu packages python-xyz) #:use-module (gnu packages glib) + #:use-module (gnu packages gettext) #:use-module (gnu packages gtk) #:use-module (gnu packages check) - #:use-module (gnu packages music)) + #:use-module (gnu packages mp3)) (define-public nicotine+ (package (name "nicotine+") - (version "2.0.1") + (version "2.1.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/Nicotine-Plus/nicotine-plus") (commit version))) (file-name (git-file-name name version)) - (sha256 (base32 "07xagm6kwy8b6gcdv5vx78yqfllkz1gvlakkf0hi2c9ivncq457g")))) + (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,18 @@ (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) - ("python-mutagen" ,python-mutagen) - ("python-dbus" ,python-dbus) - ("gtk+" ,gtk+))) + `(("gtk+" ,gtk+) + ("python-pygobject" ,python-pygobject) + ("python-pytaglib" ,python-pytaglib))) (native-inputs - `(("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest) + ("gettext" ,gettext-minimal))) (home-page "https://nicotine-plus.github.io/nicotine-plus/") (synopsis "Graphical client for Soulseek") (description -- cgit v1.2.3