diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-01 11:23:30 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-01 11:23:30 +0200 |
commit | 00935b25541bea0d6324e08e2e3821ac5cad09fd (patch) | |
tree | d29512776bc7e29a24cec743e22011580504a4f6 /pkgs/development/interpreters/picolisp/default.nix | |
parent | d5c92d5093b2fb81ee976a763b63b7c668e37d79 (diff) | |
parent | 673f3de193b5328e7c3906ebf22114956a264e96 (diff) | |
download | nixpkgs-00935b25541bea0d6324e08e2e3821ac5cad09fd.tar nixpkgs-00935b25541bea0d6324e08e2e3821ac5cad09fd.tar.gz nixpkgs-00935b25541bea0d6324e08e2e3821ac5cad09fd.tar.bz2 nixpkgs-00935b25541bea0d6324e08e2e3821ac5cad09fd.tar.lz nixpkgs-00935b25541bea0d6324e08e2e3821ac5cad09fd.tar.xz nixpkgs-00935b25541bea0d6324e08e2e3821ac5cad09fd.tar.zst nixpkgs-00935b25541bea0d6324e08e2e3821ac5cad09fd.zip |
Merge #10104: picolisp, ccl and sbcl improvements
Diffstat (limited to 'pkgs/development/interpreters/picolisp/default.nix')
-rw-r--r-- | pkgs/development/interpreters/picolisp/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index fdeb950bcfd..c43a3ce2429 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -3,12 +3,21 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "picoLisp-${version}"; - version = "3.1.10"; + version = "3.1.11"; src = fetchurl { url = "http://www.software-lab.de/${name}.tgz"; - sha256 = "1pn5c0d81rz1fazsdijhw4cqybaad2wn6qramdj2qqkzxa3vvll1"; + sha256 = "01kgyz0lkz36lxvibv07qd06gwdxvvbain9f9cnya7a12kq3009i"; }; - buildInputs = [ jdk ]; + buildInputs = optional stdenv.is64bit jdk; + patchPhase = optionalString stdenv.isArm '' + sed -i s/-m32//g Makefile + cat >>Makefile <<EOF + ext.o: ext.c + \$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c + ht.o: ht.c + \$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c + EOF + ''; sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}''; installPhase = '' cd .. |