Merge pull request #63370 from yrashk/picolisp-httpGate

picolisp: include httpGate tool
This commit is contained in:
Michael Raskin 2019-06-17 20:21:00 +00:00 committed by GitHub
commit fd12b57a2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, jdk, w3m, makeWrapper }:
{ stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
url = "https://www.software-lab.de/${name}.tgz";
sha256 = "0hvgq2vc03bki528jqn95xmvv7mw8xx832spfczhxc16wwbrnrhk";
};
buildInputs = [makeWrapper] ++ optional stdenv.is64bit jdk;
buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk;
patchPhase = ''
sed -i "s/which java/command -v java/g" mkAsm
@ -23,6 +23,9 @@ stdenv.mkDerivation rec {
''}
'';
sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}'';
postBuild = ''
cd ../src; make gate
'';
installPhase = ''
cd ..
@ -30,6 +33,7 @@ stdenv.mkDerivation rec {
cp -r . "$out/share/picolisp/build-dir"
ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp"
ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp"
ln -s "$out/lib/picolisp/bin/httpGate" "$out/bin/httpGate"
makeWrapper $out/bin/picolisp $out/bin/pil \