cinny-desktop: fix build failure

Unfortunately this leads to the loss of the system tray icon and the
functionality that comes with that. I was unfortunately unable to figure
out why this was the case, but in response, I have removed the
dependencies that were included for it.

Hopefully somebody more experienced than me can fix it.

Fixes #357406
This commit is contained in:
~noodlez1232 2024-11-19 22:46:39 -08:00
parent 5a27cc051d
commit 7d6d354a15

View File

@ -8,6 +8,7 @@
cinny, cinny,
desktop-file-utils, desktop-file-utils,
wrapGAppsHook3, wrapGAppsHook3,
makeBinaryWrapper,
pkg-config, pkg-config,
openssl, openssl,
dbus, dbus,
@ -47,13 +48,9 @@ rustPlatform.buildRustPackage rec {
in in
'' ''
substituteInPlace tauri.conf.json \ substituteInPlace tauri.conf.json \
--replace '"distDir": "../cinny/dist",' '"distDir": "${cinny'}",' --replace-warn '"distDir": "../cinny/dist",' '"distDir": "${cinny'}",'
substituteInPlace tauri.conf.json \ substituteInPlace tauri.conf.json \
--replace '"cd cinny && npm run build"' '""' --replace-warn '"cd cinny && npm run build"' '""'
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
--replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
''; '';
postInstall = postInstall =
@ -67,12 +64,18 @@ rustPlatform.buildRustPackage rec {
--set-key="Categories" --set-value="Network;InstantMessaging;" \ --set-key="Categories" --set-value="Network;InstantMessaging;" \
$out/share/applications/cinny.desktop $out/share/applications/cinny.desktop
''; '';
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
wrapProgram "$out/bin/cinny" \
--inherit-argv0 \
--set-default WEBKIT_DISABLE_DMABUF_RENDERER "1"
'';
nativeBuildInputs = [ nativeBuildInputs = [
wrapGAppsHook3 wrapGAppsHook3
pkg-config pkg-config
cargo-tauri_1.hook cargo-tauri_1.hook
desktop-file-utils desktop-file-utils
makeBinaryWrapper
]; ];
buildInputs = buildInputs =
@ -83,7 +86,6 @@ rustPlatform.buildRustPackage rec {
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
glib-networking glib-networking
libayatana-appindicator
webkitgtk_4_0 webkitgtk_4_0
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [