Skip to content

Commit 0080cc5

Browse files
worldofpeaceworldofpeace
authored
Merge pull request NixOS#116324 from jtojnar/modernize-fractal
Port meson projects away from buildRustPackage
2 parents 3e65713 + c3b4d2d commit 0080cc5

File tree

4 files changed

+49
-52
lines changed

4 files changed

+49
-52
lines changed

‎pkgs/applications/accessibility/contrast/default.nix‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{ lib
1+
{ stdenv
2+
, lib
23
, fetchFromGitLab
34
, cairo
45
, dbus
@@ -7,17 +8,17 @@
78
, glib
89
, gtk3
910
, libhandy_0
11+
, libsass
1012
, meson
1113
, ninja
1214
, pango
1315
, pkg-config
1416
, python3
15-
, rustc
1617
, rustPlatform
1718
, wrapGAppsHook
1819
}:
1920

20-
rustPlatform.buildRustPackage rec {
21+
stdenv.mkDerivation rec {
2122
pname = "contrast";
2223
version = "0.0.3";
2324

@@ -30,7 +31,11 @@ rustPlatform.buildRustPackage rec {
3031
sha256 = "0kk3mv7a6y258109xvgicmsi0lw0rcs00gfyivl5hdz7qh47iccy";
3132
};
3233

33-
cargoSha256 = "0vi8nv4hkhsgqgz36xacwkk5cxirg6li44nbmk3x7vx7c64hzybq";
34+
cargoDeps = rustPlatform.fetchCargoTarball {
35+
inherit src;
36+
name = "${pname}-${version}";
37+
hash = "sha256-ePkPiWGn79PHrMsSEql5OXZW5uRMdTP+w0/DCcm2KG4=";
38+
};
3439

3540
nativeBuildInputs = [
3641
desktop-file-utils
@@ -39,6 +44,9 @@ rustPlatform.buildRustPackage rec {
3944
ninja
4045
pkg-config
4146
python3
47+
rustPlatform.rust.cargo
48+
rustPlatform.cargoSetupHook
49+
rustPlatform.rust.rustc
4250
wrapGAppsHook
4351
glib # for glib-compile-resources
4452
];
@@ -49,19 +57,14 @@ rustPlatform.buildRustPackage rec {
4957
glib
5058
gtk3
5159
libhandy_0
60+
libsass
5261
pango
5362
];
5463

5564
postPatch = ''
5665
patchShebangs build-aux/meson_post_install.py
5766
'';
5867

59-
# Don't use buildRustPackage phases, only use it for rust deps setup
60-
configurePhase = null;
61-
buildPhase = null;
62-
checkPhase = null;
63-
installPhase = null;
64-
6568
meta = with lib; {
6669
description = "Checks whether the contrast between two colors meet the WCAG requirements";
6770
homepage = "https://gitlab.gnome.org/World/design/contrast";

‎pkgs/applications/audio/gnome-podcasts/default.nix‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
{ lib
1+
{ stdenv
2+
, lib
23
, rustPlatform
34
, fetchFromGitLab
45
, meson
56
, ninja
67
, gettext
7-
, cargo
8-
, rustc
98
, python3
109
, pkg-config
1110
, glib
@@ -18,9 +17,9 @@
1817
, wrapGAppsHook
1918
}:
2019

21-
rustPlatform.buildRustPackage rec {
22-
version = "0.4.8";
20+
stdenv.mkDerivation rec {
2321
pname = "gnome-podcasts";
22+
version = "0.4.8";
2423

2524
src = fetchFromGitLab {
2625
domain = "gitlab.gnome.org";
@@ -30,16 +29,21 @@ rustPlatform.buildRustPackage rec {
3029
sha256 = "0y2332zjq7vf1v38wzwz98fs19vpzy9kl7y0xbdzqr303l59hjb1";
3130
};
3231

33-
cargoSha256 = "1jbii9k4bkrivdk1ffr6556q1sgk9j4jbzwnn8vbxmksyl1x328q";
32+
cargoDeps = rustPlatform.fetchCargoTarball {
33+
inherit src;
34+
name = "${pname}-${version}";
35+
hash = "sha256-GInRA/V61r42spb/JYlM8+mATSkmOxdm2zHPRWaKcck=";
36+
};
3437

3538
nativeBuildInputs = [
3639
meson
3740
ninja
3841
pkg-config
3942
gettext
40-
cargo
41-
rustc
4243
python3
44+
rustPlatform.rust.cargo
45+
rustPlatform.cargoSetupHook
46+
rustPlatform.rust.rustc
4347
wrapGAppsHook
4448
glib
4549
];
@@ -57,12 +61,6 @@ rustPlatform.buildRustPackage rec {
5761
gst_all_1.gst-plugins-good
5862
];
5963

60-
# use Meson/Ninja phases
61-
configurePhase = null;
62-
buildPhase = null;
63-
checkPhase = null;
64-
installPhase = null;
65-
6664
# tests require network
6765
doCheck = false;
6866

@@ -74,7 +72,7 @@ rustPlatform.buildRustPackage rec {
7472
meta = with lib; {
7573
description = "Listen to your favorite podcasts";
7674
homepage = "https://wiki.gnome.org/Apps/Podcasts";
77-
license = licenses.gpl3;
75+
license = licenses.gpl3Plus;
7876
maintainers = teams.gnome.members;
7977
platforms = platforms.unix;
8078
};

‎pkgs/applications/audio/shortwave/default.nix‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
{ lib
1+
{ stdenv
2+
, lib
23
, fetchFromGitLab
3-
, cargo
44
, dbus
55
, desktop-file-utils
66
, gdk-pixbuf
77
, gettext
8+
, gitMinimal
89
, glib
910
, gst_all_1
1011
, gtk3
@@ -14,13 +15,12 @@
1415
, openssl
1516
, pkg-config
1617
, python3
17-
, rustc
1818
, rustPlatform
1919
, sqlite
2020
, wrapGAppsHook
2121
}:
2222

23-
rustPlatform.buildRustPackage rec {
23+
stdenv.mkDerivation rec {
2424
pname = "shortwave";
2525
version = "1.1.1";
2626

@@ -32,18 +32,24 @@ rustPlatform.buildRustPackage rec {
3232
sha256 = "1vlhp2ss06j41simjrrjg38alp85jddhqyvccy6bhfzm0gzynwld";
3333
};
3434

35-
cargoSha256 = "181699rlpr5dszc18wg0kbss3gfskxaz9lpxpgsc4yfb6ip89qnk";
35+
cargoDeps = rustPlatform.fetchCargoTarball {
36+
inherit src;
37+
name = "${pname}-${version}";
38+
hash = "sha256-0+KEbjTLecL0u/3S9FWf2r2h9ZrgcRTY163kS3NKJqA=";
39+
};
3640

3741
nativeBuildInputs = [
38-
cargo
3942
desktop-file-utils
4043
gettext
44+
gitMinimal
4145
glib # for glib-compile-schemas
4246
meson
4347
ninja
4448
pkg-config
4549
python3
46-
rustc
50+
rustPlatform.rust.cargo
51+
rustPlatform.cargoSetupHook
52+
rustPlatform.rust.rustc
4753
wrapGAppsHook
4854
];
4955

@@ -62,12 +68,6 @@ rustPlatform.buildRustPackage rec {
6268
gst-plugins-bad
6369
]);
6470

65-
# Don't use buildRustPackage phases, only use it for rust deps setup
66-
configurePhase = null;
67-
buildPhase = null;
68-
checkPhase = null;
69-
installPhase = null;
70-
7171
postPatch = ''
7272
patchShebangs build-aux/meson/postinstall.py
7373
'';

‎pkgs/applications/networking/instant-messengers/fractal/default.nix‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
{ lib, stdenv
22
, fetchFromGitLab
33
, nix-update-script
4-
, fetchpatch
54
, meson
65
, ninja
76
, gettext
8-
, cargo
9-
, rustc
107
, python3
118
, rustPlatform
129
, pkg-config
@@ -24,7 +21,7 @@
2421
, wrapGAppsHook
2522
}:
2623

27-
rustPlatform.buildRustPackage rec {
24+
stdenv.mkDerivation rec {
2825
pname = "fractal";
2926
version = "4.4.0";
3027

@@ -36,16 +33,21 @@ rustPlatform.buildRustPackage rec {
3633
sha256 = "DSNVd9YvI7Dd3s3+M0+wE594tmL1yPNMnD1W9wLhSuw=";
3734
};
3835

39-
cargoSha256 = "xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc=";
36+
cargoDeps = rustPlatform.fetchCargoTarball {
37+
inherit src;
38+
name = "${pname}-${version}";
39+
hash = "sha256-xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc=";
40+
};
4041

4142
nativeBuildInputs = [
42-
cargo
4343
gettext
4444
meson
4545
ninja
4646
pkg-config
4747
python3
48-
rustc
48+
rustPlatform.rust.cargo
49+
rustPlatform.cargoSetupHook
50+
rustPlatform.rust.rustc
4951
wrapGAppsHook
5052
glib
5153
];
@@ -76,12 +78,6 @@ rustPlatform.buildRustPackage rec {
7678
patchShebangs scripts/meson_post_install.py scripts/test.sh
7779
'';
7880

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-
8581
passthru = {
8682
updateScript = nix-update-script {
8783
attrPath = pname;
@@ -91,7 +87,7 @@ rustPlatform.buildRustPackage rec {
9187
meta = with lib; {
9288
description = "Matrix group messaging app";
9389
homepage = "https://gitlab.gnome.org/GNOME/fractal";
94-
license = licenses.gpl3;
90+
license = licenses.gpl3Plus;
9591
broken = stdenv.isDarwin;
9692
maintainers = with maintainers; [ dtzWill worldofpeace ];
9793
};

0 commit comments

Comments
 (0)