From e1786d996e34c93a73757e19c50fdd2f1cf96527 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 5 Jan 2025 12:36:32 +0100 Subject: [PATCH] clisp: disable PIE hardening, fix strictDeps build --- pkgs/development/interpreters/clisp/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index ff166272e3f5..555bfc45beff 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -9,6 +9,7 @@ fetchFromGitLab, autoconf269, automake, + bash, libtool, libsigsegv, gettext, @@ -77,7 +78,10 @@ stdenv.mkDerivation { libtool ]; buildInputs = - [ libsigsegv ] + [ + bash + libsigsegv + ] ++ lib.optional (gettext != null) gettext ++ lib.optional (ncurses != null) ncurses ++ lib.optional (pcre != null) pcre @@ -141,10 +145,15 @@ stdenv.mkDerivation { cd builddir ''; + # ;; Loading file ../src/defmacro.lisp ... + # *** - handle_fault error2 ! address = 0x8 not in [0x1000000c0000,0x1000000c0000) ! + # SIGSEGV cannot be cured. Fault address = 0x8. + hardeningDisable = [ "pie" ]; + doCheck = true; postInstall = lib.optionalString (withModules != [ ]) ( - ''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' + ''bash ./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' + lib.concatMapStrings (x: " " + x) withModules );