Skip to content

Commit 5d18af8

Browse files
authored
dbeaver-bin: fix build on aarch64-linux (#381766)
2 parents 2e67130 + e1584ee commit 5d18af8

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

pkgs/by-name/db/dbeaver-bin/package.nix

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
6060
--replace-fail '-Xmx1024m' '-Xmx${override_xmx}'
6161
'';
6262

63+
preInstall = ''
64+
# most directories are for different architectures, only keep what we need
65+
shopt -s extglob
66+
pushd ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "Contents/Eclipse/"}plugins/com.sun.jna_5.15.0.v20240915-2000/com/sun/jna/
67+
rm -r !(ptr|internal|linux-x86-64|linux-aarch64|darwin-x86-64|darwin-aarch64)/
68+
popd
69+
'';
70+
6371
installPhase =
6472
if !stdenvNoCC.hostPlatform.isDarwin then
6573
''
@@ -81,7 +89,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
8189
}"
8290
8391
mkdir -p $out/share/icons/hicolor/256x256/apps
84-
ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png
92+
# for some reason it's missing from the aarch64 build
93+
if [ -e $out/opt/dbeaver/dbeaver.png ]; then
94+
ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png
95+
fi
8596
8697
mkdir -p $out/share/applications
8798
ln -s $out/opt/dbeaver/dbeaver-ce.desktop $out/share/applications/dbeaver.desktop
@@ -107,10 +118,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
107118
runHook postInstall
108119
'';
109120

110-
autoPatchelfIgnoreMissingDeps = [
111-
"libc.so.8"
112-
];
113-
114121
passthru.updateScript = ./update.sh;
115122

116123
meta = {

0 commit comments

Comments
 (0)