diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-16 08:43:13 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-16 08:49:23 +0000 |
| commit | 579ae9b989b630c971dad85a7d05078a4fb94137 (patch) | |
| tree | 4add353b9addbedcc01a30cdcd7c6e6ced4bdcf8 /pkgs/development/interpreters | |
| parent | 94c8c31bee161b6e64c3c99e8031f5532fa6a6d8 (diff) | |
| parent | e5cfe9ee44d6b9f06ed38d7ebd9f74cd665fe27b (diff) | |
| download | nixlib-579ae9b989b630c971dad85a7d05078a4fb94137.tar nixlib-579ae9b989b630c971dad85a7d05078a4fb94137.tar.gz nixlib-579ae9b989b630c971dad85a7d05078a4fb94137.tar.bz2 nixlib-579ae9b989b630c971dad85a7d05078a4fb94137.tar.lz nixlib-579ae9b989b630c971dad85a7d05078a4fb94137.tar.xz nixlib-579ae9b989b630c971dad85a7d05078a4fb94137.tar.zst nixlib-579ae9b989b630c971dad85a7d05078a4fb94137.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/python-modules/cirq-core/default.nix
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/clisp/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
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" |