From b315bd7e0d39edb99cbacfa8fd2b8233fff68ceb Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Thu, 14 Jul 2022 20:19:49 +0200 Subject: [PATCH] acl2: makeWrapper to nativeBuildInputs --- pkgs/development/interpreters/acl2/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 170e2a183298..1ca3742e737b 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -10,7 +10,7 @@ let # ACL2 system itself; see # https://www.cs.utexas.edu/users/moore/acl2/current/HTML/installation/requirements.html#Obtaining-SBCL sbcl' = args.sbcl.override { disableImmobileSpace = true; }; - sbcl = runCommandLocal args.sbcl.name { buildInputs = [ makeWrapper ]; } '' + sbcl = runCommandLocal args.sbcl.name { nativeBuildInputs = [ makeWrapper ]; } '' makeWrapper ${sbcl'}/bin/sbcl $out/bin/sbcl \ --add-flags "--dynamic-space-size 2000" ''; @@ -40,12 +40,14 @@ in stdenv.mkDerivation rec { libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}"; })]; + nativeBuildInputs = lib.optional certifyBooks makeWrapper; + buildInputs = [ # ACL2 itself only needs a Common Lisp compiler/interpreter: sbcl ] ++ lib.optionals certifyBooks [ # To build community books, we need Perl and a couple of utilities: - which perl hostname makeWrapper + which perl hostname # Some of the books require one or more of these external tools: glucose minisat abc-verifier libipasir z3 (python2.withPackages (ps: [ ps.z3 ]))