From d2b48c21e575fa93711832206b3bb300b98435fa Mon Sep 17 00:00:00 2001 From: merrkry Date: Sun, 16 Mar 2025 19:14:44 +0800 Subject: [PATCH] tsukimi: 0.19.3 -> 0.19.4 --- pkgs/by-name/ts/tsukimi/package.nix | 44 ++++++++++++++--------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix index 633a790ed00f..09cb809c7fc4 100644 --- a/pkgs/by-name/ts/tsukimi/package.nix +++ b/pkgs/by-name/ts/tsukimi/package.nix @@ -11,25 +11,39 @@ libepoxy, wrapGAppsHook4, nix-update-script, + stdenv, + meson, + ninja, + rustc, + cargo, + dbus, + desktop-file-utils, }: -rustPlatform.buildRustPackage rec { +stdenv.mkDerivation rec { pname = "tsukimi"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "tsukinaha"; repo = "tsukimi"; tag = "v${version}"; - hash = "sha256-MNPg3qg9wRRWKofH4NSRIa76+nA3IFoMfOt6s5+4y8A="; - fetchSubmodules = true; + hash = "sha256-7Us+mz0FHetka4uVDCWkAGyGMZRhQDotRsySljYZgCo="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-mS5qKEm3oCHiFP5i/XHnIOBmXzvlgfE2i/f0lLl4TN4="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + hash = "sha256-JaBFL7XHVjf4NP41n9qtb5oQyaP1bYQETPYMCR9XEvQ="; + }; nativeBuildInputs = [ pkg-config wrapGAppsHook4 + meson + ninja + rustPlatform.cargoSetupHook + rustc + cargo + desktop-file-utils ]; buildInputs = @@ -39,6 +53,7 @@ rustPlatform.buildRustPackage rec { libadwaita openssl libepoxy + dbus ] ++ (with gst_all_1; [ gstreamer @@ -51,23 +66,6 @@ rustPlatform.buildRustPackage rec { doCheck = false; # tests require networking - postPatch = '' - substituteInPlace build.rs \ - --replace-fail 'i18n/locale' "$out/share/locale" - - substituteInPlace src/lib.rs \ - --replace-fail '/usr/share/locale' "$out/share/locale" - ''; - - postInstall = '' - install -Dm644 resources/moe.tsuna.tsukimi.gschema.xml -t $out/share/glib-2.0/schemas - glib-compile-schemas $out/share/glib-2.0/schemas - - install -Dm644 resources/icons/tsukimi.png -t $out/share/pixmaps - - install -Dm644 resources/moe.tsuna.tsukimi.desktop.in $out/share/applications/moe.tsuna.tsukimi.desktop - ''; - passthru.updateScript = nix-update-script { }; meta = {