From b64a221abf3c4d01fd926d80bbb266327e1ac45a Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Sun, 15 Oct 2023 17:11:10 -0400 Subject: [PATCH] clisp: enable ASDF module This is useful and expected by most downstream packages --- pkgs/development/interpreters/clisp/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index ac6257164cb7..14b436375420 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -29,6 +29,7 @@ , x11Support ? (stdenv.hostPlatform.isx86 && ! stdenv.hostPlatform.isDarwin) , dllSupport ? true , withModules ? [ + "asdf" "pcre" "rawsock" ] @@ -41,6 +42,8 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null let ffcallAvailable = stdenv.isLinux && (libffcall != null); + # Some modules need autoreconf called in their directory. + shouldReconfModule = name: name != "asdf"; in stdenv.mkDerivation { @@ -92,7 +95,7 @@ stdenv.mkDerivation { cd modules/${x} autoreconf -f -i -I "$root/src" -I "$root/src/m4" -I "$root/src/glm4" ) - '') withModules); + '') (builtins.filter shouldReconfModule withModules)); configureFlags = [ "builddir" ] ++ lib.optional (!dllSupport) "--without-dynamic-modules"