From f467be8e15f8905e2e9d117eb2b21978a6c90e0c Mon Sep 17 00:00:00 2001 From: Naxdy Date: Fri, 17 May 2024 08:11:52 +0200 Subject: [PATCH] dbeaver-bin: wrap program to find `openjdk17` --- pkgs/by-name/db/dbeaver-bin/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index e72824c7a30c..47a90db11e2b 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -1,12 +1,16 @@ { lib , stdenvNoCC , fetchurl +, makeWrapper +, openjdk17 }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; version = "24.0.4"; + nativeBuildInputs = [ makeWrapper ]; + src = let inherit (stdenvNoCC.hostPlatform) system; @@ -32,7 +36,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out/opt/dbeaver $out/bin cp -r * $out/opt/dbeaver - ln -s $out/opt/dbeaver/dbeaver $out/bin/dbeaver + makeWrapper $out/opt/dbeaver/dbeaver $out/bin/dbeaver \ + --prefix PATH : "${openjdk17}/bin" \ + --set JAVA_HOME "${openjdk17.home}" runHook postInstall '';