Skip to content

Commit f58d6d1

Browse files
authored
cinny-desktop: make more dependencies optional, don't double wrap binary (#407761)
2 parents 06a2a3a + bdefe3b commit f58d6d1

File tree

1 file changed

+15
-20
lines changed

1 file changed

+15
-20
lines changed

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

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@
77
cinny,
88
desktop-file-utils,
99
wrapGAppsHook3,
10-
makeBinaryWrapper,
1110
pkg-config,
1211
openssl,
13-
dbus,
14-
glib,
1512
glib-networking,
1613
webkitgtk_4_0,
1714
jq,
@@ -64,31 +61,29 @@ rustPlatform.buildRustPackage rec {
6461
--set-key="Categories" --set-value="Network;InstantMessaging;" \
6562
$out/share/applications/cinny.desktop
6663
'';
67-
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
68-
wrapProgram "$out/bin/cinny" \
69-
--inherit-argv0 \
64+
65+
preFixup = ''
66+
gappsWrapperArgs+=(
7067
--set-default WEBKIT_DISABLE_DMABUF_RENDERER "1"
68+
)
7169
'';
7270

73-
nativeBuildInputs = [
74-
wrapGAppsHook3
75-
pkg-config
76-
cargo-tauri_1.hook
77-
desktop-file-utils
78-
makeBinaryWrapper
79-
];
80-
81-
buildInputs =
71+
nativeBuildInputs =
8272
[
83-
openssl
73+
cargo-tauri_1.hook
8474
]
8575
++ lib.optionals stdenv.hostPlatform.isLinux [
86-
dbus
87-
glib
88-
glib-networking
89-
webkitgtk_4_0
76+
desktop-file-utils
77+
pkg-config
78+
wrapGAppsHook3
9079
];
9180

81+
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
82+
glib-networking
83+
openssl
84+
webkitgtk_4_0
85+
];
86+
9287
meta = {
9388
description = "Yet another matrix client for desktop";
9489
homepage = "https://github.com/cinnyapp/cinny-desktop";

0 commit comments

Comments
 (0)