Merge pull request #106814 from freezeboy/unbreak-archi

archi: unbreak build
This commit is contained in:
Sandro 2021-01-20 14:40:11 +01:00 committed by GitHub
commit 9a3761b663
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,6 +2,8 @@
, fetchurl , fetchurl
, fetchzip , fetchzip
, autoPatchelfHook , autoPatchelfHook
, makeWrapper
, jdk
, libsecret , libsecret
}: }:
@ -29,17 +31,20 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoPatchelfHook autoPatchelfHook
makeWrapper
]; ];
installPhase = installPhase =
if stdenv.hostPlatform.system == "x86_64-linux" then if stdenv.hostPlatform.system == "x86_64-linux" then
'' ''
mkdir -p $out/bin mkdir -p $out/bin $out/libexec
for f in configuration features p2 plugins Archi.ini Archi; do for f in configuration features p2 plugins Archi.ini; do
cp $f $out/bin/ cp -r $f $out/libexec
done 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 else
'' ''