diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-01 11:20:24 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-01 11:20:24 +0200 |
commit | 673f3de193b5328e7c3906ebf22114956a264e96 (patch) | |
tree | e3b2e6b764d4aba3618d29570f8dcb0ba14b171d /pkgs/development/interpreters | |
parent | 4e66ba1a70368ea9ba6f8af1dc931d54404bec72 (diff) | |
download | nixlib-673f3de193b5328e7c3906ebf22114956a264e96.tar nixlib-673f3de193b5328e7c3906ebf22114956a264e96.tar.gz nixlib-673f3de193b5328e7c3906ebf22114956a264e96.tar.bz2 nixlib-673f3de193b5328e7c3906ebf22114956a264e96.tar.lz nixlib-673f3de193b5328e7c3906ebf22114956a264e96.tar.xz nixlib-673f3de193b5328e7c3906ebf22114956a264e96.tar.zst nixlib-673f3de193b5328e7c3906ebf22114956a264e96.zip |
lisps: some refactoring
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/picolisp/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 496a4ff66681..c43a3ce2429b 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { url = "http://www.software-lab.de/${name}.tgz"; sha256 = "01kgyz0lkz36lxvibv07qd06gwdxvvbain9f9cnya7a12kq3009i"; }; - buildInputs = if stdenv.is64bit then [ jdk ] else []; - patchPhase = if stdenv.isArm then '' + buildInputs = optional stdenv.is64bit jdk; + patchPhase = optionalString stdenv.isArm '' sed -i s/-m32//g Makefile cat >>Makefile <<EOF ext.o: ext.c @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { ht.o: ht.c \$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c EOF - '' - else ""; + ''; sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}''; installPhase = '' cd .. |