archi: unbreak build
Additionally make a wrapper to put the jdk in the PATH to avoid needed a global JDK
This commit is contained in:
parent
e955c4315f
commit
b25ba4a632
|
@ -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
|
||||||
''
|
''
|
||||||
|
|
Loading…
Reference in a new issue