public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #53010 from osmano807/patch-1

Browse Source 
picoLisp 16.12 -> 18.12
This commit is contained in:
Silvan Mosberger 2018-12-31 03:32:48 +01:00 committed by GitHub
commit 61e4654814
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/interpreters/picolisp/default.nix
View File

@ -1,15 +1,18 @@
{ stdenv, fetchurl, jdk }: { stdenv, fetchurl, jdk, makeWrapper }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "picoLisp-${version}"; name = "picoLisp-${version}";
version = "16.12"; version = "18.12";
src = fetchurl { src = fetchurl {
url = "https://www.software-lab.de/${name}.tgz"; url = "https://www.software-lab.de/${name}.tgz";
sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75"; sha256 = "0hvgq2vc03bki528jqn95xmvv7mw8xx832spfczhxc16wwbrnrhk";
}; };
buildInputs = optional stdenv.is64bit jdk; buildInputs = [makeWrapper] ++ optional stdenv.is64bit jdk;
patchPhase = optionalString stdenv.isAarch32 '' patchPhase = ''
sed -i "s/which java/command -v java/g" mkAsm
${optionalString stdenv.isAarch32 ''
sed -i s/-m32//g Makefile sed -i s/-m32//g Makefile
cat >>Makefile <<EOF cat >>Makefile <<EOF
ext.o: ext.c ext.o: ext.c
@ -17,6 +20,7 @@ stdenv.mkDerivation rec {
ht.o: ht.c ht.o: ht.c
\$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c \$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c
EOF EOF
''}
''; '';
sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}''; sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}'';
installPhase = '' installPhase = ''
@ -27,11 +31,13 @@ stdenv.mkDerivation rec {
ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp" 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/picolisp" "$out/bin/picolisp"
cat >"$out/bin/pil" <<EOF
#! /bin/sh makeWrapper $out/bin/picolisp $out/bin/pil \
exec $out/bin/picolisp $out/lib/picolisp/lib.l @lib/misc.l @lib/btree.l @lib/db.l @lib/pilog.l --add-flags "$out/lib/picolisp/lib.l" \
EOF --add-flags "@lib/misc.l" \
chmod +x "$out/bin/pil" --add-flags "@lib/btree.l" \
--add-flags "@lib/db.l" \
--add-flags "@lib/pilog.l"
mkdir -p "$out/share/emacs" mkdir -p "$out/share/emacs"
ln -s "$out/lib/picolisp/lib/el" "$out/share/emacs/site-lisp" ln -s "$out/lib/picolisp/lib/el" "$out/share/emacs/site-lisp"