diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2020-09-05 21:56:34 +0300 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2020-09-05 22:30:04 +0300 |
commit | de3c03a47160dec355d9b19ad5ca210d90c15fd7 (patch) | |
tree | 4ca6dc05b5fc9530d812bbb269f1c61ab9efccf3 /gnu/packages/smalltalk.scm | |
parent | ab6fe9d362046231ad6f46eccfd1ea2c9c80b401 (diff) | |
parent | b8477cab7bccc4191ed3dfa3f149aec7917834d8 (diff) | |
download | guix-patches-de3c03a47160dec355d9b19ad5ca210d90c15fd7.tar guix-patches-de3c03a47160dec355d9b19ad5ca210d90c15fd7.tar.gz |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/packages/smalltalk.scm')
-rw-r--r-- | gnu/packages/smalltalk.scm | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index 9b36d83a80..5d35f563e2 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -85,11 +85,10 @@ such as ones for networking and GUI programming.") (source (origin (method url-fetch) - (uri (string-append "http://www.squeakvm.org/unix/release/" + (uri (string-append "http://squeakvm.org/unix/release/" "Squeak-" version "-src.tar.gz")) (sha256 - (base32 - "0bpwbnpy2sb4gylchfx50sha70z36bwgdxraym4vrr93l8pd3dix")) + (base32 "0bpwbnpy2sb4gylchfx50sha70z36bwgdxraym4vrr93l8pd3dix")) (modules '((guix build utils))) (snippet ;; Make builds bit-reproducible. @@ -125,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) @@ -149,5 +143,5 @@ the original Smalltalk-80 system. Squeak has very powerful 2- and 3-D graphics, sound, video, MIDI, animation and other multimedia capabilities. It also includes a customisable framework for creating dynamic HTTP servers and interactively extensible Web sites.") - (home-page "http://www.squeakvm.org") + (home-page "http://squeakvm.org/") (license license:x11))) |