Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dbeaver-bin: fix build on aarch64-linux #381766

Merged
merged 2 commits into from
Feb 14, 2025
Merged

dbeaver-bin: fix build on aarch64-linux #381766

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fdf1fb
dbeaver-bin: remove files for unsupported architectures
gepbird Feb 13, 2025
e1584ee
dbeaver-bin: fix with noBrokenSymlinks
gepbird Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions pkgs/by-name/db/dbeaver-bin/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
--replace-fail '-Xmx1024m' '-Xmx${override_xmx}'
'';

preInstall = ''
# most directories are for different architectures, only keep what we need
shopt -s extglob
pushd ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "Contents/Eclipse/"}plugins/com.sun.jna_5.15.0.v20240915-2000/com/sun/jna/
rm -r !(ptr|internal|linux-x86-64|linux-aarch64|darwin-x86-64|darwin-aarch64)/
popd
'';

installPhase =
if !stdenvNoCC.hostPlatform.isDarwin then
''
Expand All @@ -81,7 +89,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
}"

mkdir -p $out/share/icons/hicolor/256x256/apps
ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png
# for some reason it's missing from the aarch64 build
if [ -e $out/opt/dbeaver/dbeaver.png ]; then
ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png
fi

mkdir -p $out/share/applications
ln -s $out/opt/dbeaver/dbeaver-ce.desktop $out/share/applications/dbeaver.desktop
Expand All @@ -107,10 +118,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
runHook postInstall
'';

autoPatchelfIgnoreMissingDeps = [
"libc.so.8"
];

passthru.updateScript = ./update.sh;

meta = {
Expand Down