From d34bc5bd3a5a28dde2772304a1d178f9374d22bd Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Fri, 29 Sep 2023 13:18:48 -0400 Subject: [PATCH] clisp: fix preconfigure phase on x86_64-darwin One of the module names has a `/` in it so the hard-coded technique to "jump back to the previous directory" by using `../..` doesn't work. N.B.: build is still broken. This only fixes the preconfigure phase. --- pkgs/development/interpreters/clisp/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index cb0e547331c0..30a2f6787edc 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -82,13 +82,16 @@ stdenv.mkDerivation { ''; preConfigure = lib.optionalString stdenv.isDarwin ('' - cd src - autoreconf -f -i -I m4 -I glm4 - cd - + ( + cd src + autoreconf -f -i -I m4 -I glm4 + ) '' + lib.concatMapStrings (x: '' - cd modules/${x} - autoreconf -f -i -I ../../src -I ../../src/m4 -I ../../src/glm4 - cd - + ( + root="$PWD" + cd modules/${x} + autoreconf -f -i -I "$root/src" -I "$root/src/m4" -I "$root/src/glm4" + ) '') withModules); configureFlags = [ "builddir" ]