diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-20 14:40:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-20 14:40:11 +0100 |
| commit | 9a3761b6632790782834603c626e1c018aceccfb (patch) | |
| tree | c03b865ab8446dd0399fde88b3b3c07da9750ec0 /pkgs/tools/misc/archi | |
| parent | 0e21aef5938e6c971eb6ad9314d5989b1a1baec0 (diff) | |
| parent | b25ba4a6329c6f3e4b4a75889e47f59020630bc4 (diff) | |
Merge pull request #106814 from freezeboy/unbreak-archi
archi: unbreak build
Diffstat (limited to 'pkgs/tools/misc/archi')
| -rw-r--r-- | pkgs/tools/misc/archi/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index 554700dad93fc..d0beb7d40d75f 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -2,6 +2,8 @@ , fetchurl , fetchzip , autoPatchelfHook +, makeWrapper +, jdk , libsecret }: @@ -29,17 +31,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook + makeWrapper ]; installPhase = if stdenv.hostPlatform.system == "x86_64-linux" then '' - mkdir -p $out/bin - for f in configuration features p2 plugins Archi.ini Archi; do - cp $f $out/bin/ + mkdir -p $out/bin $out/libexec + for f in configuration features p2 plugins Archi.ini; do + cp -r $f $out/libexec done - install -D -m755 Archi $out/bin/Archi + install -D -m755 Archi $out/libexec/Archi + makeWrapper $out/libexec/Archi $out/bin/Archi \ + --prefix PATH : ${jdk}/bin '' else '' |