diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:50 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:50 +0200 |
| commit | f02206d63d0e702e5d874162f91dd36614c31b2c (patch) | |
| tree | 82f79c8dc3d5cf7108055155e6332f64485b0acf /pkgs/development/interpreters/clisp | |
| parent | 94e608d5877814bea7096d522524d937d6e82ad5 (diff) | |
| parent | d9fa74ba7891cfae4a029ee79dd29e4ab3425385 (diff) | |
| download | nixlib-f02206d63d0e702e5d874162f91dd36614c31b2c.tar nixlib-f02206d63d0e702e5d874162f91dd36614c31b2c.tar.gz nixlib-f02206d63d0e702e5d874162f91dd36614c31b2c.tar.bz2 nixlib-f02206d63d0e702e5d874162f91dd36614c31b2c.tar.lz nixlib-f02206d63d0e702e5d874162f91dd36614c31b2c.tar.xz nixlib-f02206d63d0e702e5d874162f91dd36614c31b2c.tar.zst nixlib-f02206d63d0e702e5d874162f91dd36614c31b2c.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/development/interpreters/clisp')
| -rw-r--r-- | pkgs/development/interpreters/clisp/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/interpreters/clisp/hg.nix | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 9ab43e7392d7..0a54a916ba73 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -67,15 +67,15 @@ stdenv.mkDerivation rec { substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" "" ''; - configureFlags = "builddir" - + stdenv.lib.optionalString (!dllSupport) " --without-dynamic-modules" - + stdenv.lib.optionalString (readline != null) " --with-readline" + configureFlags = [ "builddir" ] + ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules" + ++ stdenv.lib.optional (readline != null) "--with-readline" # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise - + stdenv.lib.optionalString (ffcallAvailable && (libffi != null)) " --with-dynamic-ffi" - + stdenv.lib.optionalString ffcallAvailable " --with-ffcall" - + stdenv.lib.optionalString (!ffcallAvailable) " --without-ffcall" - + stdenv.lib.concatMapStrings (x: " --with-module=" + x) withModules - + stdenv.lib.optionalString threadSupport " --with-threads=POSIX_THREADS"; + ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" + ++ stdenv.lib.optional ffcallAvailable "--with-ffcall" + ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall" + ++ builtins.map (x: "--with-module=" + x) withModules + ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS"; preBuild = '' sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index 9839220796c7..47dbf8a225cf 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -62,15 +62,15 @@ stdenv.mkDerivation rec { substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" "" ''; - configureFlags = "builddir" - + stdenv.lib.optionalString (!dllSupport) " --without-dynamic-modules" - + stdenv.lib.optionalString (readline != null) " --with-readline" + configureFlags = [ "builddir" ] + ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules" + ++ stdenv.lib.optional (readline != null) "--with-readline" # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise - + stdenv.lib.optionalString (ffcallAvailable && (libffi != null)) " --with-dynamic-ffi" - + stdenv.lib.optionalString ffcallAvailable " --with-ffcall" - + stdenv.lib.optionalString (!ffcallAvailable) " --without-ffcall" - + stdenv.lib.concatMapStrings (x: " --with-module=" + x) withModules - + stdenv.lib.optionalString threadSupport " --with-threads=POSIX_THREADS"; + ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" + ++ stdenv.lib.optional ffcallAvailable "--with-ffcall" + ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall" + ++ builtins.map (x: " --with-module=" + x) withModules + ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS"; preBuild = '' sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d |