diff options
| author | ~noodlez1232 <contact@nathanielbarragan.xyz> | 2024-11-19 22:46:39 -0800 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2024-11-26 02:34:20 +0000 |
| commit | f359e9af16ca434153ea6b05880b7ab469071e99 (patch) | |
| tree | 733c75fae19d0b838be2155843401474a3907121 | |
| parent | [Backport release-24.11] ladybird: 0-unstable-2024-11-06 -> 0-unstable-2024-1... (diff) | |
| download | nixpkgs-origin/backport-357482-to-release-24.11.tar.gz | |
cinny-desktop: fix build failureorigin/backport-357482-to-release-24.11
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
(cherry picked from commit 7d6d354a153530d950acbe126809653a04963534)
| -rw-r--r-- | pkgs/by-name/ci/cinny-desktop/package.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index c62796024db5..f1595df7042d 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -8,6 +8,7 @@ cinny, desktop-file-utils, wrapGAppsHook3, + makeBinaryWrapper, pkg-config, openssl, dbus, @@ -47,13 +48,9 @@ rustPlatform.buildRustPackage rec { in '' substituteInPlace tauri.conf.json \ - --replace '"distDir": "../cinny/dist",' '"distDir": "${cinny'}",' + --replace-warn '"distDir": "../cinny/dist",' '"distDir": "${cinny'}",' substituteInPlace tauri.conf.json \ - --replace '"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" + --replace-warn '"cd cinny && npm run build"' '""' ''; postInstall = @@ -67,12 +64,18 @@ rustPlatform.buildRustPackage rec { --set-key="Categories" --set-value="Network;InstantMessaging;" \ $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 = [ wrapGAppsHook3 pkg-config cargo-tauri_1.hook desktop-file-utils + makeBinaryWrapper ]; buildInputs = @@ -83,7 +86,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking - libayatana-appindicator webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ |