Skip to content

Commit 37697c4

Browse files
authored
xdg-desktop-portal-shana: switch from buildrustpackage to mkderivation (#393432)
2 parents 3ecf126 + 4ee0923 commit 37697c4

File tree

1 file changed

+21
-16
lines changed

1 file changed

+21
-16
lines changed
Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,51 @@
11
{
22
lib,
3+
stdenv,
34
rustPlatform,
45
fetchFromGitHub,
56
meson,
7+
rustc,
8+
cargo,
69
ninja,
710
xdg-desktop-portal,
811
}:
912

10-
rustPlatform.buildRustPackage rec {
13+
stdenv.mkDerivation (finalAttrs: {
1114
pname = "xdg-desktop-portal-shana";
1215
version = "0.3.14";
1316

1417
src = fetchFromGitHub {
1518
owner = "Decodetalkers";
1619
repo = "xdg-desktop-portal-shana";
17-
rev = "v${version}";
20+
rev = "v${finalAttrs.version}";
1821
hash = "sha256-9uie6VFyi7sO8DbthUTgpEc68MvvLA+bUwyV/DSpKkE=";
1922
};
2023

24+
cargoDeps = rustPlatform.fetchCargoVendor {
25+
inherit (finalAttrs) pname version src;
26+
hash = "sha256-f9kfCoH0YHVzzZC4rChJgz0yQqVVAYR7Gpa6HuXhQZY=";
27+
};
28+
2129
nativeBuildInputs = [
2230
meson
31+
rustc
32+
rustPlatform.cargoSetupHook
33+
cargo
2334
ninja
2435
];
2536

2637
buildInputs = [
2738
xdg-desktop-portal
2839
];
2940

30-
# Needed for letting meson run. rustPackage will overwrite it otherwise.
31-
configurePhase = "";
32-
33-
mesonBuildType = "release";
34-
35-
useFetchCargoVendor = true;
36-
cargoHash = "sha256-f9kfCoH0YHVzzZC4rChJgz0yQqVVAYR7Gpa6HuXhQZY=";
37-
38-
meta = with lib; {
41+
meta = {
3942
description = "Filechooser portal backend for any desktop environment";
4043
homepage = "https://github.com/Decodetalkers/xdg-desktop-portal-shana";
41-
license = licenses.mit;
42-
platforms = platforms.linux;
43-
maintainers = [ maintainers.samuelefacenda ];
44+
license = lib.licenses.mit;
45+
platforms = lib.platforms.linux;
46+
maintainers = with lib.maintainers; [
47+
samuelefacenda
48+
Rishik-Y
49+
];
4450
};
45-
46-
}
51+
})

0 commit comments

Comments
 (0)