Skip to content

Commit d2b48c2

Browse files
committed
tsukimi: 0.19.3 -> 0.19.4
1 parent 6607cf7 commit d2b48c2

File tree

1 file changed

+21
-23
lines changed

1 file changed

+21
-23
lines changed

pkgs/by-name/ts/tsukimi/package.nix

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,39 @@
1111
libepoxy,
1212
wrapGAppsHook4,
1313
nix-update-script,
14+
stdenv,
15+
meson,
16+
ninja,
17+
rustc,
18+
cargo,
19+
dbus,
20+
desktop-file-utils,
1421
}:
15-
rustPlatform.buildRustPackage rec {
22+
stdenv.mkDerivation rec {
1623
pname = "tsukimi";
17-
version = "0.19.3";
24+
version = "0.19.4";
1825

1926
src = fetchFromGitHub {
2027
owner = "tsukinaha";
2128
repo = "tsukimi";
2229
tag = "v${version}";
23-
hash = "sha256-MNPg3qg9wRRWKofH4NSRIa76+nA3IFoMfOt6s5+4y8A=";
24-
fetchSubmodules = true;
30+
hash = "sha256-7Us+mz0FHetka4uVDCWkAGyGMZRhQDotRsySljYZgCo=";
2531
};
2632

27-
useFetchCargoVendor = true;
28-
cargoHash = "sha256-mS5qKEm3oCHiFP5i/XHnIOBmXzvlgfE2i/f0lLl4TN4=";
33+
cargoDeps = rustPlatform.fetchCargoVendor {
34+
inherit src;
35+
hash = "sha256-JaBFL7XHVjf4NP41n9qtb5oQyaP1bYQETPYMCR9XEvQ=";
36+
};
2937

3038
nativeBuildInputs = [
3139
pkg-config
3240
wrapGAppsHook4
41+
meson
42+
ninja
43+
rustPlatform.cargoSetupHook
44+
rustc
45+
cargo
46+
desktop-file-utils
3347
];
3448

3549
buildInputs =
@@ -39,6 +53,7 @@ rustPlatform.buildRustPackage rec {
3953
libadwaita
4054
openssl
4155
libepoxy
56+
dbus
4257
]
4358
++ (with gst_all_1; [
4459
gstreamer
@@ -51,23 +66,6 @@ rustPlatform.buildRustPackage rec {
5166

5267
doCheck = false; # tests require networking
5368

54-
postPatch = ''
55-
substituteInPlace build.rs \
56-
--replace-fail 'i18n/locale' "$out/share/locale"
57-
58-
substituteInPlace src/lib.rs \
59-
--replace-fail '/usr/share/locale' "$out/share/locale"
60-
'';
61-
62-
postInstall = ''
63-
install -Dm644 resources/moe.tsuna.tsukimi.gschema.xml -t $out/share/glib-2.0/schemas
64-
glib-compile-schemas $out/share/glib-2.0/schemas
65-
66-
install -Dm644 resources/icons/tsukimi.png -t $out/share/pixmaps
67-
68-
install -Dm644 resources/moe.tsuna.tsukimi.desktop.in $out/share/applications/moe.tsuna.tsukimi.desktop
69-
'';
70-
7169
passthru.updateScript = nix-update-script { };
7270

7371
meta = {

0 commit comments

Comments
 (0)