From patchwork Mon Dec 12 10:09:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Konrad Hinsen X-Patchwork-Id: 45185 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6AE6127BBEC; Mon, 12 Dec 2022 10:10:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2850027BBEB for ; Mon, 12 Dec 2022 10:10:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4fl8-0002Y3-U5; Mon, 12 Dec 2022 05:10:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p4fl5-0002WK-59 for guix-patches@gnu.org; Mon, 12 Dec 2022 05:10:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4fl4-0005hn-TA for guix-patches@gnu.org; Mon, 12 Dec 2022 05:10:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4fl4-00084z-8T for guix-patches@gnu.org; Mon, 12 Dec 2022 05:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59997] [PATCH] gnu: add minimacy Resent-From: Konrad Hinsen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Dec 2022 10:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59997@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167083979131040 (code B ref -1); Mon, 12 Dec 2022 10:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Dec 2022 10:09:51 +0000 Received: from localhost ([127.0.0.1]:51919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4fks-00084a-V9 for submit@debbugs.gnu.org; Mon, 12 Dec 2022 05:09:51 -0500 Received: from lists.gnu.org ([209.51.188.17]:54594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4fkq-00084U-Nl for submit@debbugs.gnu.org; Mon, 12 Dec 2022 05:09:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p4fko-0002Nf-OI for guix-patches@gnu.org; Mon, 12 Dec 2022 05:09:48 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p4fkm-0005eX-Af for guix-patches@gnu.org; Mon, 12 Dec 2022 05:09:46 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id EB74C320092D; Mon, 12 Dec 2022 05:09:38 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 12 Dec 2022 05:09:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.net; h= cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm2; t=1670839778; x=1670926178; bh=DBawIY6wac G6fGq0fjdqSSTEGwaF1xBvExvDHg1LqRE=; b=E8S86ek0QQb2RXizAM3jsBK/Nn VYX/w+z9Oz1dpaKF8BTj2yXb6jxMhYmwIPZrOoW13pVmNTqqeZiW5SteD+iv6UOP 63+kTM/52bx0mkwvrlY5eKzCSo8OPZDu5TW+/KtmOcUW87iOsa/mYTRUa3dxXoMq OmUPx26ALjpCDj4isXQJkPYauAT+qMjNHDJ1B88zcAXwr7lh/B9EPOZUtRa9M7AH hir0dEVH033yK8aheApwHn+lvQrkOUL/muMZk1RGuOXzat0F8SkCtEOCzFKps4y5 OjSfO6Qu9WCSdnmQBnzA3zEIYSVHYTxUVwhKE8w2LfYsfkZag115Hwa5DbOQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1670839778; x=1670926178; bh=DBawIY6wacG6fGq0fjdqSSTEGwaF 1xBvExvDHg1LqRE=; b=E27SE2Ev7HIkg17qxjKi9Cv2vNBVp9gDqWpCX31OGv0T JcCCN+X9fUqUMqEUv/ke6a2efiXE0Ct1gecBe1rvQqWIxxHGq8oehkikB2nnkbn2 vNf1/wrHVmFf5hthe+sf2TmnTOlnYhJG3w7hnhN6FpNHFjAwF555D5GnkXCqlvaq g117gkNf05JhHR027IyK1lVRLD8qR8OfnfNkto2+9DxevPJJVs/TS0JdD16a4XT6 +cCxAEKT4ujWCQH6w0E0Ls56MU1egZ6uOsI9bbIBosTaeBJXSgI8D0kh5pDm/JAK xOtFXbGhlFSHY8s43dRLUglo4U0nSjoj6k3Du2nMgg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdejgddugedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkgggtgfesthhqredttd dtjeenucfhrhhomhepmfhonhhrrgguucfjihhnshgvnhcuoehkohhnrhgrugdrhhhinhhs vghnsehfrghsthhmrghilhdrnhgvtheqnecuggftrfgrthhtvghrnheptdektdefuedtfe fgkeefgfehjefhgeefhfffledtuedtveegudfhfefgkeeivdeinecuffhomhgrihhnpehg nhhurdhorhhgpdhgihhthhhusgdrtghomhdpmhhinhhimhgrtgihrdhnvghtnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepkhhonhhrrggurdhh ihhnshgvnhesfhgrshhtmhgrihhlrdhnvght X-ME-Proxy: Feedback-ID: i184641e2:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 12 Dec 2022 05:09:37 -0500 (EST) From: Konrad Hinsen Date: Mon, 12 Dec 2022 11:09:35 +0100 Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.20; envelope-from=konrad.hinsen@fastmail.net; helo=wout4-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/minimacy.scm: New module. --- gnu/packages/minimacy.scm | 90 +++++++++++++++++++++++++++++ gnu/packages/patches/minimacy.patch | 34 +++++++++++ 2 files changed, 124 insertions(+) create mode 100644 gnu/packages/minimacy.scm create mode 100644 gnu/packages/patches/minimacy.patch diff --git a/gnu/packages/minimacy.scm b/gnu/packages/minimacy.scm new file mode 100644 index 0000000000..549ca8f14f --- /dev/null +++ b/gnu/packages/minimacy.scm @@ -0,0 +1,90 @@ +;;; Copyright © 2022 Konrad Hinsen +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages minimacy) + #:use-module (gnu packages) + #:use-module (gnu packages xorg) + #:use-module (gnu packages gl) + #:use-module (gnu packages linux) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) + +(define-public minimacy + (package + (name "minimacy") + (version "0.6.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ambermind/minimacy/") + (commit "0.6.2"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1x9i1spf79lq3kxms55dx7lf8pl84cyblq313sjyfpr9l187ailb")) + (patches (search-patches "minimacy.patch")))) + (build-system gnu-build-system) + (inputs (list libx11 libxext alsa-lib mesa glu)) + (outputs '("out" ; the core + "X11" ; for GUI programs, with X11 and ALSA + "X11GL")) ; for GUI programs, with X11, OpenGL, and ALSA + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-path + (lambda _ + (substitute* "src/hw.c" + (("minimacy-in-gnu-store") + (assoc-ref %outputs "out"))))) + (delete 'configure) + (replace 'build + (lambda _ + (chdir "unix") + (invoke "make" "nox") + (for-each delete-file + (find-files "../obj" "\\.o$")) + (invoke "make" "x11") + (for-each delete-file + (find-files "../obj" "\\.o$")) + (invoke "make" "x11gl") + (chdir ".."))) + (replace 'install + (lambda _ + (let ((output (assoc-ref %outputs "out"))) + (install-file "bin/minimacy" (string-append output "/bin")) + (mkdir-p (string-append output "/rom")) + (mkdir-p (string-append output "/system")) + (copy-recursively "rom" (string-append output "/rom")) + (copy-recursively "system" (string-append output "/system"))) + (let ((output (assoc-ref %outputs "X11"))) + (install-file "bin/minimacyX11" (string-append output "/bin"))) + (let ((output (assoc-ref %outputs "X11GL"))) + (install-file "bin/minimacyX11GL" (string-append output "/bin"))))) + (delete 'check)))) + (synopsis "Minimalist computing system") + (description + "Minimacy is an open-source minimalist computing technology. +It consists of a programming language (compiler plus virtual machine) +and a library, written such that the whole system can be fully +understood by a single person. An optional extension to the virtual +machine adds X11 and ALSA for user interfaces, another extension +adds OpenGL support.") + (home-page "https://minimacy.net/") + (license license:gpl2))) diff --git a/gnu/packages/patches/minimacy.patch b/gnu/packages/patches/minimacy.patch new file mode 100644 index 0000000000..eca49431c3 --- /dev/null +++ b/gnu/packages/patches/minimacy.patch @@ -0,0 +1,34 @@ +The Minimacy distribution is set up for being compiled and used from the +user's home directory. Running Minimacy as a Guix package requires adding +its store path as a search path for the virtual machine. That is done in +two steps: this patch, and a substitution of the actual store path in the +build process. + +--- minimacy/src/hw.c 2022-12-05 18:51:13.000000000 +0100 ++++ minimacy/src/hw.c 2022-12-09 15:55:47.122793826 +0100 +@@ -90,6 +90,13 @@ + #if defined ON_UNIX || defined ON_MACOS_CMDLINE || defined ON_RASPBERRY64 + void systemExecDir(char* path, int len) + { ++ char* p = "minimacy-in-gnu-store"; ++ if (strlen(p) < len - 2) ++ { ++ strcpy(path, p); ++ systemCleanDir(path); ++ return; ++ } + path[0] = 0; + } + #endif +@@ -583,8 +590,9 @@ + PRINTF(th, LOG_USER, "1- command line argument: -dir path\n"); + PRINTF(th, LOG_USER, "2- environment variable MINIMACY\n"); + PRINTF(th, LOG_USER, "3- grand parent of minimacy.exe (windows only)\n"); +- PRINTF(th, LOG_USER, "4- ~/minimacy (on Unix) or [user]/Documents/minimacy (on Windows)\n"); +- PRINTF(th, LOG_USER, "5- Working directory\n\n"); ++ PRINTF(th, LOG_USER, "4- the minimacy package under /gnu/store (Guix only)\n"); ++ PRINTF(th, LOG_USER, "5- ~/minimacy (on Unix) or [user]/Documents/minimacy (on Windows)\n"); ++ PRINTF(th, LOG_USER, "6- Working directory\n\n"); + } + int hwInit(Thread* th, int argc, char** argv, int standalone) + {