From bbf0e1231e5246858e47df0384528e7395d0b12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 8 Nov 2024 14:19:30 +0100 Subject: [PATCH 1/2] dbeaver-bin: fix build on darwin, fixes #354475 --- pkgs/by-name/db/dbeaver-bin/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index ece1216d445c..7ec12cce9527 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontBuild = true; prePatch = '' - substituteInPlace dbeaver.ini \ + substituteInPlace ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "Contents/Eclipse/"}dbeaver.ini \ --replace-fail '-Xmx1024m' '-Xmx${override_xmx}' ''; From 4904e3f5df2beecca432591d7ff96c83e767c6b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 8 Nov 2024 14:46:38 +0100 Subject: [PATCH 2/2] dbeaver-bin: fix on case-sensitive fs --- pkgs/by-name/db/dbeaver-bin/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 7ec12cce9527..c9cc55579986 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit hash; }; - sourceRoot = lib.optional stdenvNoCC.hostPlatform.isDarwin "dbeaver.app"; + sourceRoot = lib.optional stdenvNoCC.hostPlatform.isDarwin "DBeaver.app"; nativeBuildInputs = [ makeWrapper ]