@@ -1,22 +1,26 @@
1−{ stdenv, fetchurl, jdk }:
1+{ stdenv, fetchurl, jdk, makeWrapper }:
22with stdenv.lib;
33
44stdenv.mkDerivation rec {
55 name = "picoLisp-${version}";
6− version = "16.12";
6+ version = "18.12";
77 src = fetchurl {
88 url = "https://www.software-lab.de/${name}.tgz";
9− sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75";
9+ sha256 = "0hvgq2vc03bki528jqn95xmvv7mw8xx832spfczhxc16wwbrnrhk";
1010 };
11− buildInputs = optional stdenv.is64bit jdk;
12− patchPhase = optionalString stdenv.isAarch32 ''
13− sed -i s/-m32//g Makefile
14− cat >>Makefile <<EOF
15− ext.o: ext.c
16− \$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c
17− ht.o: ht.c
18− \$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c
19− EOF
11+ buildInputs = [makeWrapper] ++ optional stdenv.is64bit jdk;
12+ patchPhase = ''
13+ sed -i "s/which java/command -v java/g" mkAsm
14+
15+ ${optionalString stdenv.isAarch32 ''
16+ sed -i s/-m32//g Makefile
17+ cat >>Makefile <<EOF
18+ ext.o: ext.c
19+ \$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c
20+ ht.o: ht.c
21+ \$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c
22+ EOF
23+ ''}
2024 '';
2125 sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}'';
2226 installPhase = ''
@@ -27,11 +31,13 @@ stdenv.mkDerivation rec {
2731 ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp"
2832 ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp"
2933
30− cat >"$out/bin/pil" <<EOF
31− #! /bin/sh
32− exec $out/bin/picolisp $out/lib/picolisp/lib.l @lib/misc.l @lib/btree.l @lib/db.l @lib/pilog.l
33− EOF
34− chmod +x "$out/bin/pil"
34+
35+ makeWrapper $out/bin/picolisp $out/bin/pil \
36+ --add-flags "$out/lib/picolisp/lib.l" \
37+ --add-flags "@lib/misc.l" \
38+ --add-flags "@lib/btree.l" \
39+ --add-flags "@lib/db.l" \
40+ --add-flags "@lib/pilog.l"
3541
3642 mkdir -p "$out/share/emacs"
3743 ln -s "$out/lib/picolisp/lib/el" "$out/share/emacs/site-lisp"