pyrox.dev
fractal: port away from buildRustPackage
The new setup hooks compose better with Meson setup hooks.
Also correct license.
+10
-14
pkgs/applications/networking/instant-messengers/fractal/default.nix
+10
-14
pkgs/applications/networking/instant-messengers/fractal/default.nix
···
1
1
{ lib, stdenv
2
2
, fetchFromGitLab
3
3
, nix-update-script
4
-
, fetchpatch
5
4
, meson
6
5
, ninja
7
6
, gettext
8
-
, cargo
9
-
, rustc
10
7
, python3
11
8
, rustPlatform
12
9
, pkg-config
···
24
21
, wrapGAppsHook
25
22
}:
26
23
27
-
rustPlatform.buildRustPackage rec {
24
+
stdenv.mkDerivation rec {
28
25
pname = "fractal";
29
26
version = "4.4.0";
30
27
···
36
33
sha256 = "DSNVd9YvI7Dd3s3+M0+wE594tmL1yPNMnD1W9wLhSuw=";
37
34
};
38
35
39
-
cargoSha256 = "xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc=";
36
+
cargoDeps = rustPlatform.fetchCargoTarball {
37
+
inherit src;
38
+
name = "${pname}-${version}";
39
+
hash = "sha256-xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc=";
40
+
};
40
41
41
42
nativeBuildInputs = [
42
-
cargo
43
43
gettext
44
44
meson
45
45
ninja
46
46
pkg-config
47
47
python3
48
-
rustc
48
+
rustPlatform.rust.cargo
49
+
rustPlatform.cargoSetupHook
50
+
rustPlatform.rust.rustc
49
51
wrapGAppsHook
50
52
glib
51
53
];
···
76
78
patchShebangs scripts/meson_post_install.py scripts/test.sh
77
79
'';
78
80
79
-
# Don't use buildRustPackage phases, only use it for rust deps setup
80
-
configurePhase = null;
81
-
buildPhase = null;
82
-
checkPhase = null;
83
-
installPhase = null;
84
-
85
81
passthru = {
86
82
updateScript = nix-update-script {
87
83
attrPath = pname;
···
91
87
meta = with lib; {
92
88
description = "Matrix group messaging app";
93
89
homepage = "https://gitlab.gnome.org/GNOME/fractal";
94
-
license = licenses.gpl3;
90
+
license = licenses.gpl3Plus;
95
91
broken = stdenv.isDarwin;
96
92
maintainers = with maintainers; [ dtzWill worldofpeace ];
97
93
};