From 30d6eb85dac539e19994f4637dfc60ecf8826c0b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 25 Jul 2020 13:53:23 +0200 Subject: [PATCH] gnu: squeak-vm: Enter build directory once. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/smalltalk.scm (squeak-vm)[arguments]: Use CHDIR instead of pseudofunctional WITH-DIRECTORY-EXCURSIONs. Drop the custom ‘build’ phase. --- gnu/packages/smalltalk.scm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index ea4f8f8db2..5d35f563e2 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -124,23 +124,18 @@ such as ones for networking and GUI programming.") "unix/cmake/squeak.sh.in") (("^PATH=.*") "")) #t)) - (add-after 'unpack 'create-build-dir + (add-before 'configure 'enter-build-directory (lambda _ - (mkdir "bld") + (mkdir "build") + (chdir "build") #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (with-directory-excursion "bld" - (invoke "../unix/cmake/configure" - (string-append "--prefix=" out) - "--without-quartz") - #t)))) - (replace 'build - (lambda _ - (with-directory-excursion "bld" - (invoke "make")) - #t))))) + (invoke "../unix/cmake/configure" + (string-append "--prefix=" out) + "--without-quartz") + #t)))))) (synopsis "Smalltalk programming language and environment") (description "Squeak is a full-featured implementation of the Smalltalk programming language and environment based on (and largely compatible with)