From 47a0a4582ff2c0a5e1f20581fedbac1b9c0aad30 Mon Sep 17 00:00:00 2001 From: Gary Wong Date: Sun, 10 Nov 2024 21:11:25 -0700 Subject: [PATCH] Add some missing Rust dependencies. --- shortwave.scm | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/shortwave.scm b/shortwave.scm index 460ccec..aed54d1 100644 --- a/shortwave.scm +++ b/shortwave.scm @@ -1,4 +1,6 @@ (define-module (shortwave) + #:use-module (gnu packages crates-gtk) + #:use-module (gnu packages crates-io) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -11,13 +13,42 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) - #:use-module (guix build-system meson) + #:use-module (guix build-system cargo) + #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix lic:) #:use-module (guix packages) #:use-module (guix utils)) +(define-public rust-libadwaita-0.2 + (package + (name "rust-libadwaita") + (version "0.2.0-alpha.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "libadwaita" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0irg2pdk501jp1mwxpncfv8clhga3kyprs1zf6r1sbd61jimz0bk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.18) + ("rust-gdk4" ,rust-gdk4-0.7) + ("rust-gio" ,rust-gio-0.18) + ("rust-glib" ,rust-glib-0.18) + ("rust-gtk4" ,rust-gtk4-0.7) + ("rust-libadwaita-sys" ,rust-libadwaita-sys-0.5) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango" ,rust-pango-0.18)))) + (native-inputs (list pkg-config)) + (inputs (list libadwaita)) + (home-page "https://world.pages.gitlab.gnome.org/Rust/libadwaita-rs") + (synopsis "Rust bindings for libadwaita") + (description "Rust bindings for libadwaita.") + (license lic:expat))) + (define-public shortwave (package (name "shortwave") @@ -33,7 +64,13 @@ (base32 "0176razcl593vdg1lnfvs4zfv5nd3h9xzz5vy6midf287p47a9hi")))) (inputs (list dbus gstreamer gst-plugins-bad gst-plugins-base gtk libadwaita libshumate openssl rust sqlite)) (native-inputs (list desktop-file-utils gettext-minimal git `(,glib "bin") `(,gtk+ "bin") pkg-config rust-cargo)) - (build-system meson-build-system) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-async-std" ,rust-async-std-1) + ("rust-inflector" ,rust-inflector-0.11) + ("rust-libadwaita" ,rust-libadwaita-0.2)))) (synopsis "An internet radio player.") (description "Shortwave is an internet radio player that provides access to a station database with over 50,000 stations.") -- 2.11.4.GIT