Skip to content

Commit 8a71da9

Browse files
committed
Clean up old cruft
The official guide for NixOS shows QT_XKB_CONFIG_ROOT being set, but it's not entirely clear to me if this is actually needed. Nothing in Nixpkgs seems to do this. So I'm removing it now. Also, avoid wrapping wrappers.
1 parent e076d56 commit 8a71da9

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

package.nix

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
fontconfig,
1010
xorg,
1111
dbus,
12-
xkeyboard_config,
1312
libxkbcommon,
1413
wayland-scanner,
1514
kdePackages,
@@ -57,10 +56,13 @@ stdenv.mkDerivation {
5756
mkdir -p $out/opt
5857
cp -r * $out/opt
5958
chmod +x $out/opt/binaryninja
60-
makeWrapper $out/opt/binaryninja \
61-
$out/bin/binaryninja \
62-
--prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb"
59+
makeWrapper $out/opt/binaryninja $out/bin/binaryninja \
60+
"''${qtWrapperArgs[@]}"
6361
6462
runHook postInstall
6563
'';
64+
dontWrapQtApps = true;
65+
meta = {
66+
mainProgram = "binaryninja";
67+
};
6668
}

0 commit comments

Comments
 (0)