From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 27 14:20:47 2023 Received: (at 59997) by debbugs.gnu.org; 27 Jan 2023 19:20:47 +0000 Received: from localhost ([127.0.0.1]:38523 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLUHG-0004MJ-Qp for submit@debbugs.gnu.org; Fri, 27 Jan 2023 14:20:47 -0500 Received: from mail-wm1-f54.google.com ([209.85.128.54]:39485) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLUHE-0004M6-Kk for 59997@debbugs.gnu.org; Fri, 27 Jan 2023 14:20:45 -0500 Received: by mail-wm1-f54.google.com with SMTP id l35-20020a05600c1d2300b003dc4634a466so35401wms.4 for <59997@debbugs.gnu.org>; Fri, 27 Jan 2023 11:20:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pIWA+DVAqU7ngOizPuG8/s06hrSskA05G4gbhoMkA7o=; b=O9noOVLFpDrrE4UrpVKgOm4jNZN8ZwbAVcUhwyHXVKPZ470yuql5XGBQwvu+ZIRhaD I+n3DLyBCJzC0BDehIn9lClfRvTpYcR7YdFrbcRBJBr1UzF4rffj+DZQUSQaaTU3Ux8X qgAq7Kh9O7qbwkJ0Jww88KH86o+oajMsrpsEQyQ0U551rr1u9l1cIQ3bxBWjHPejw+RL uNcnUbDUckUXn110/ktpC29XdA/9fdxW/fJWLN7v4fxs+yjmwdMwVjcTz3PfseHy4Q7Z 8vDz5pnVxOL5RSqtHHxLrleRW7wK6WmLaXJ6r525F+wdjSkC/8vE5ab1ZuluF/oXIlyT Da+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pIWA+DVAqU7ngOizPuG8/s06hrSskA05G4gbhoMkA7o=; b=wQin3a/GcXih7evCnH6WF3260eowLaKrnthrWr8jEoUivW4FvxcpVbcRuNZJXnnqA+ ZSH7ghQEhYv0DF3nOSZqkC8Ytdj8vSu1bf0OlXWM419mns1D/VA+WSwyAt0Ud4eYKAl8 rlMM+Kb10385LUx1RuDPBAug0CSeGfl9oxsvEyOCdpnPe5FiZPwZVNPqwdkI6C4UiMpS 6Zw68geDHKQGAvcWZKJocaU+/5qk+M693TP86Lglk1w604rAujLsLjSBjhsO2oGuWSkn g24QYp7NZrNC0Q1QaraLuZmg/9v3zO0jyHikI+k0nvOJasyQpp4RWFTW/o14+oT3JkZh RVDQ== X-Gm-Message-State: AFqh2koTnAytiPeUeKsPR4CTJKZitcAI4qOUFyRyEbPZq0WD53pdYpIW bPUE1XGbD3Vu5PuEzSe/WLy2zxNmA58= X-Google-Smtp-Source: AMrXdXsZ0Ptes3pZIsW+WUNG725ikxEEMUzNDixhosTkcc+8qqbGkZqQ/NOF7ZKuNMmEHuIaTgfpaw== X-Received: by 2002:a05:600c:1515:b0:3db:2b9:21fc with SMTP id b21-20020a05600c151500b003db02b921fcmr8991916wmg.4.1674847238700; Fri, 27 Jan 2023 11:20:38 -0800 (PST) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id h23-20020a05600c499700b003dab40f9eafsm4945352wmp.35.2023.01.27.11.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 11:20:37 -0800 (PST) From: Simon Tournier To: 59997@debbugs.gnu.org Subject: [PATCH v3] gnu: Add minimacy. Date: Fri, 27 Jan 2023 20:20:31 +0100 Message-Id: <20230127192031.3142167-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59997 Cc: Konrad Hinsen X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Konrad Hinsen * gnu/packages/minimacy.scm: New file. * gnu/packages/patches/minimacy.patch: New patch. * gnu/local.mk: Add them. --- gnu/local.mk | 2 + gnu/packages/minimacy.scm | 102 ++++++++++++++++++++++++++++ gnu/packages/patches/minimacy.patch | 34 ++++++++++ 3 files changed, 138 insertions(+) create mode 100644 gnu/packages/minimacy.scm create mode 100644 gnu/packages/patches/minimacy.patch diff --git a/gnu/local.mk b/gnu/local.mk index 29237b1138..212c95c98b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -424,6 +424,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/messaging.scm \ %D%/packages/minetest.scm \ %D%/packages/mingw.scm \ + %D%/packages/minimacy.scm \ %D%/packages/microcom.scm \ %D%/packages/moe.scm \ %D%/packages/motti.scm \ @@ -1540,6 +1541,7 @@ dist_patch_DATA = \ %D%/packages/patches/mingw-w64-reproducible-gendef.patch \ %D%/packages/patches/minisat-friend-declaration.patch \ %D%/packages/patches/minisat-install.patch \ + %D%/packages/patches/minimacy.patch \ %D%/packages/patches/mit-krb5-hurd.patch \ %D%/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch \ %D%/packages/patches/mixxx-system-googletest-benchmark.patch \ diff --git a/gnu/packages/minimacy.scm b/gnu/packages/minimacy.scm new file mode 100644 index 0000000000..6cfba75879 --- /dev/null +++ b/gnu/packages/minimacy.scm @@ -0,0 +1,102 @@ +;;; 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 gexp) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix git-download) + #: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 version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1x9i1spf79lq3kxms55dx7lf8pl84cyblq313sjyfpr9l187ailb")) + (patches (search-patches "minimacy.patch")) + (modules '((guix build utils))) + (snippet '(delete-file-recursively "windows")))) + (build-system gnu-build-system) + (inputs (list libx11 libxext alsa-lib mesa glu)) + (outputs '("out" ;core + "X11" ;for GUI programs, with X11 and ALSA + "X11GL")) ;for GUI programs, with X11, OpenGL, and ALSA + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-path + (lambda* (#:key outputs #:allow-other-keys) + (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* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (x11 (assoc-ref outputs "X11")) + (x11gl (assoc-ref outputs "X11GL"))) + (mkdir-p (string-append out "/rom")) + (mkdir-p (string-append out "/system")) + (copy-recursively "rom" + (string-append out "/rom")) + (copy-recursively "system" + (string-append out "/system")) + (install-file "bin/minimacy" + (string-append out "/bin")) + (install-file "bin/minimacyX11" + (string-append x11 "/bin")) + (install-file "bin/minimacyX11GL" + (string-append x11gl "/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) + { base-commit: 8e1cca32b938cef0812ce042c6c2e8bccb326ec7 -- 2.38.1