From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Goaziou Subject: [PATCH] Add squeak-vm Date: Wed, 24 Aug 2016 23:22:08 +0200 Message-ID: <87oa4h277j.fsf@saiph.selenimh> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcfch-00084A-0Y for guix-devel@gnu.org; Wed, 24 Aug 2016 17:22:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bcfce-0005Gv-9h for guix-devel@gnu.org; Wed, 24 Aug 2016 17:22:09 -0400 Received: from relay3-d.mail.gandi.net ([2001:4b98:c:538::195]:41770) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcfcd-0005GQ-Vx for guix-devel@gnu.org; Wed, 24 Aug 2016 17:22:08 -0400 Received: from saiph.selenimh (unknown [IPv6:2a03:a0a0:0:4301::b3c]) (Authenticated sender: mail@nicolasgoaziou.fr) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 80865A80BE for ; Wed, 24 Aug 2016 23:22:06 +0200 (CEST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --=-=-= Content-Type: text/plain Hello, The following patches add squeak-vm. The build process is rather unusual since this is cmake with a configure script in a remote place. IOW, I couldn't build it with regular cmake-build-system and #:configure-flags. Regards, -- Nicolas Goaziou 0x80A93738 --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-smalltalk-Use-license-prefix.patch Content-Transfer-Encoding: quoted-printable >From 1dd3ba62776ccfb9e240cd0381ffe3a1e9ce82d5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 24 Aug 2016 22:47:01 +0200 Subject: [PATCH 1/2] gnu: smalltalk: Use "license:" prefix. * gnu/packages/smalltalk.scm (smalltalk): Use "license:" prefix. --- gnu/packages/smalltalk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index 77e033f..42de69a 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2013 Nikita Karetnikov ;;; Copyright =C2=A9 2016 Efraim Flashner +;;; Copyright =C2=A9 2016 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,7 +19,7 @@ ;;; along with GNU Guix. If not, see . =20 (define-module (gnu packages smalltalk) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -63,4 +64,4 @@ "GNU Smalltalk is a free implementation of the Smalltalk language. It implements the ANSI standard for the language and also includes extra clas= ses such as ones for networking and GUI programming.") - (license gpl2+))) + (license license:gpl2+))) --=20 2.9.2 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-gnu-Add-squeak-vm.patch >From b9da73934a55ee1cbec2a0ad0f477083cd967743 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 24 Aug 2016 22:58:44 +0200 Subject: [PATCH 2/2] gnu: Add squeak-vm * gnu/packages/smalltalk.scm (squeak-vm): New variable. --- gnu/packages/smalltalk.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index 42de69a..d5e98e3 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -22,11 +22,20 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages gl) + #:use-module (gnu packages glib) #:use-module (gnu packages libffi) #:use-module (gnu packages libsigsegv) + #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages xorg) #:use-module (gnu packages zip)) (define-public smalltalk @@ -65,3 +74,63 @@ implements the ANSI standard for the language and also includes extra classes such as ones for networking and GUI programming.") (license license:gpl2+))) + +(define-public squeak-vm + (package + (name "squeak-vm") + (version "4.10.2.2614") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.squeakvm.org/unix/release/" + "Squeak-" version "-src.tar.gz")) + (sha256 + (base32 + "0bpwbnpy2sb4gylchfx50sha70z36bwgdxraym4vrr93l8pd3dix")))) + (native-inputs + `(("alsa-lib" ,alsa-lib) + ("dbus" ,dbus) + ("freetype" ,freetype) + ("libffi" ,libffi) + ("libiconv" ,libiconv) + ("libxrender" ,libxrender) + ("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("pulseaudio" ,pulseaudio))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;No check target + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'create-build-dir + (lambda _ + (mkdir "bld") + #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion "bld" + (zero? + (system* "../unix/cmake/configure" + (string-append "--prefix=" out) + ,(if (string-prefix? "x86_64" + (or (%current-target-system) + (%current-system))) + "--image64" + "") + "--without-quartz")))))) + (replace 'build + (lambda _ + (with-directory-excursion "bld" + (zero? (system* "make")))))))) + (synopsis "Implementation of the 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) 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") + (license license:x11))) -- 2.9.2 --=-=-=--