Skip to content

Commit e25ed78

Browse files
authored
cinny-desktop: fix build failure (#357482)
2 parents c9a8698 + 7d6d354 commit e25ed78

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

pkgs/by-name/ci/cinny-desktop/package.nix

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
cinny,
99
desktop-file-utils,
1010
wrapGAppsHook3,
11+
makeBinaryWrapper,
1112
pkg-config,
1213
openssl,
1314
dbus,
@@ -47,13 +48,9 @@ rustPlatform.buildRustPackage rec {
4748
in
4849
''
4950
substituteInPlace tauri.conf.json \
50-
--replace '"distDir": "../cinny/dist",' '"distDir": "${cinny'}",'
51+
--replace-warn '"distDir": "../cinny/dist",' '"distDir": "${cinny'}",'
5152
substituteInPlace tauri.conf.json \
52-
--replace '"cd cinny && npm run build"' '""'
53-
''
54-
+ lib.optionalString stdenv.hostPlatform.isLinux ''
55-
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
56-
--replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
53+
--replace-warn '"cd cinny && npm run build"' '""'
5754
'';
5855

5956
postInstall =
@@ -67,12 +64,18 @@ rustPlatform.buildRustPackage rec {
6764
--set-key="Categories" --set-value="Network;InstantMessaging;" \
6865
$out/share/applications/cinny.desktop
6966
'';
67+
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
68+
wrapProgram "$out/bin/cinny" \
69+
--inherit-argv0 \
70+
--set-default WEBKIT_DISABLE_DMABUF_RENDERER "1"
71+
'';
7072

7173
nativeBuildInputs = [
7274
wrapGAppsHook3
7375
pkg-config
7476
cargo-tauri_1.hook
7577
desktop-file-utils
78+
makeBinaryWrapper
7679
];
7780

7881
buildInputs =
@@ -83,7 +86,6 @@ rustPlatform.buildRustPackage rec {
8386
]
8487
++ lib.optionals stdenv.hostPlatform.isLinux [
8588
glib-networking
86-
libayatana-appindicator
8789
webkitgtk_4_0
8890
]
8991
++ lib.optionals stdenv.hostPlatform.isDarwin [

0 commit comments

Comments
 (0)