Skip to content

Commit

Permalink
dbeaver-bin: change order of attrs
Browse files Browse the repository at this point in the history
  • Loading branch information
gepbird committed Jun 18, 2024
1 parent cd0de86 commit 41f0db2
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions pkgs/by-name/db/dbeaver-bin/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbeaver-bin";
version = "24.1.0";

nativeBuildInputs =
[ makeWrapper ]
++ lib.optionals (!stdenvNoCC.isDarwin) [
gnused
wrapGAppsHook3
autoPatchelfHook
]
++ lib.optionals stdenvNoCC.isDarwin [ undmg ];

src =
let
inherit (stdenvNoCC.hostPlatform) system;
Expand All @@ -45,15 +36,25 @@ stdenvNoCC.mkDerivation (finalAttrs: {
inherit hash;
};

sourceRoot = lib.optional stdenvNoCC.isDarwin "dbeaver.app";

nativeBuildInputs =
[ makeWrapper ]
++ lib.optionals (!stdenvNoCC.isDarwin) [
gnused
wrapGAppsHook3
autoPatchelfHook
]
++ lib.optionals stdenvNoCC.isDarwin [ undmg ];

dontConfigure = true;
dontBuild = true;

sourceRoot = lib.optional stdenvNoCC.isDarwin "dbeaver.app";

installPhase =
if !stdenvNoCC.isDarwin then
''
runHook preInstall
mkdir -p $out/opt/dbeaver $out/bin
cp -r * $out/opt/dbeaver
makeWrapper $out/opt/dbeaver/dbeaver $out/bin/dbeaver \
Expand Down

0 comments on commit 41f0db2

Please sign in to comment.