From patchwork Tue Apr 9 11:20:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 62889 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 2D63D27BBE9; Tue, 9 Apr 2024 12:26:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=unavailable 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 CB0D727BBE2 for ; Tue, 9 Apr 2024 12:26:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ru9c0-0007zP-Qb; Tue, 09 Apr 2024 07:26:00 -0400 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 1ru9bu-0007yS-V1 for guix-patches@gnu.org; Tue, 09 Apr 2024 07:25:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ru9bu-0001AP-JG for guix-patches@gnu.org; Tue, 09 Apr 2024 07:25:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ru9c2-0000to-Gw for guix-patches@gnu.org; Tue, 09 Apr 2024 07:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64348] [PATCH v4] gnu: Add durden. References: <3136090a794cd91a2500d3979236bfc3701f17d9.1688034098.git.a.r.draidi@redscript.org> In-Reply-To: <3136090a794cd91a2500d3979236bfc3701f17d9.1688034098.git.a.r.draidi@redscript.org> Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Apr 2024 11:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64348 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64348@debbugs.gnu.org Cc: Ahmad Draidi , liliana.prikler@gmail.com Received: via spool by 64348-submit@debbugs.gnu.org id=B64348.17126619183400 (code B ref 64348); Tue, 09 Apr 2024 11:26:02 +0000 Received: (at 64348) by debbugs.gnu.org; 9 Apr 2024 11:25:18 +0000 Received: from localhost ([127.0.0.1]:48510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ru9bK-0000sm-3v for submit@debbugs.gnu.org; Tue, 09 Apr 2024 07:25:18 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:33002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ru9bD-0000sR-Si for 64348@debbugs.gnu.org; Tue, 09 Apr 2024 07:25:17 -0400 Received: from localhost.localdomain (bba-92-98-21-134.alshamil.net.ae [92.98.21.134]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 103A37E81; Tue, 9 Apr 2024 11:24:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1712661896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0/fbHCoQcArcs3yXsLZr8SLy9dLV20AaEI5Lkv6Tok=; b=GOSMgm5eRJdxXObA0BX9QNgU1izTZ9kSw5L58MJ1BeiAkL79qrlLk0NMVHlE62r3YpDl+g 3Uuk7UJD/6wldfdD8JpCVie2BkjxdluzRjWQPpRos685wmdT1ENFXogSMKnr7NXw43GMbv b2QiC1y7959SQJRYIGlUDfnzAXPIvfTaRxDqv6eCGOKG8N9FFE2nzvl5kD37mJwcLzoCQH nZ4b39zHBAK1g2MQ+Q4oCr+YmjHD3xXTG9NlT+m3o2RYaUs1KcRH74fQvO3qbpekXG0Lob q9X6gahp+4lzU7xkcCYNXPatkrHNa2/aGiEn2SOp4775uhQtULHeoBoPTd7JvBdeQMmKqh plw1cI1mtv4dUus9TIngyqQ7i1V0E24+ttPeMZySRbOsDYHJtsMP+nc0kpLOirgBzq8ifU siTiwgUvyk3YozwAOEOKcpwHvWoiV7ucBOR+ksTASbGzE1HT5sEar8c2K+Pd3XVJHx48kI M5fNTtg4J/HkjIsQXFWoNAUpTNZDryRCMt52XTSR3iAI3JvV97uozoTXSjI3u5U5UtYd4U GNGxrRM08bUuymumrLYyeXtDbaT9+1ftPVJpr2LYgcJ+TOeQVHEkLM/kpG4V7I3kEe3hzS hiSBe7oqCJP0sIOF2pOOSEEXleJYM9EU381c4CB879B3W1IMohGh8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1712661896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0/fbHCoQcArcs3yXsLZr8SLy9dLV20AaEI5Lkv6Tok=; b=y37pWvKh6lkgqgv11m0z9HweHyRWMN3/rX5MGRAvoXnbK1VQNnzVj1lRxDI99kjCrKUnXy wPWjtadt831iQCBA== Date: Tue, 9 Apr 2024 15:20:00 +0400 Message-ID: <682006543f08e606b9d774d75d0b29205b610d7e.1712661600.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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: , Reply-to: Ahmad Draidi X-ACL-Warn: , Ahmad Draidi via Guix-patches X-Patchwork-Original-From: Ahmad Draidi via Guix-patches via From: Ahmad Draidi 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/arcan.scm (durden): New variable. Change-Id: I3ea34563c74c227eed40f4ad50d23713c45ce70b --- Hello Liliana, Thanks for the review. I believe I got all of them. Coreutils are a sneaky bunch :) Thanks! v2 changes: Rebase to fix conflicts v3 changes: Update to commit matching Arcan 0.6.3 (68016) v4 changes: Hard-code coreutils and arcan paths in "durden" shell script gnu/packages/arcan.scm | 72 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) base-commit: 51de844a0ff6ea224367a384092896bce6848b9f diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index c4dfa8da3e..9d68005175 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 L p R n d n ;;; Copyright © 2021 Guillaume Le Vaillant -;;; Copyright © 2023 Ahmad Draidi +;;; Copyright © 2023, 2024 Ahmad Draidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +20,7 @@ (define-module (gnu packages arcan) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system meson) #:use-module (guix build-system gnu) #:use-module (guix gexp) @@ -29,6 +30,7 @@ (define-module (gnu packages arcan) #:use-module (guix utils) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages databases) @@ -183,6 +185,74 @@ (define-public arcan-sdl "-DSTATIC_FREETYPE=off" "-DSHMIF_TUI_ACCEL=on"))))) (synopsis "Combined display server, multimedia framework and game engine (SDL)"))) +(define-public durden + ;; Match Arcan 0.6.3 + (let ((commit "a8938b9c835f55bedc2c42aec4ddc5c9739eb949") + (revision "1")) + (package + (name "durden") + (version (git-version "0.6.1" revision commit)) + (source + (origin + (method git-fetch) + (file-name (git-file-name name version)) + (uri (git-reference + (url "https://github.com/letoram/durden") + (commit commit))) + (sha256 + (base32 "1ybi6x2kwn597kjqycrqmlvp6z79yv2jfwzgx937wcckm55xlpvk")))) + (build-system copy-build-system) + (arguments + (list + #:install-plan #~'(("durden/" "share/arcan/appl/durden/") + ("util/" "share/arcan/appl/durden/util/") + ("distr/durden" "bin/durden")) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "distr/durden" + (("/usr/share/\\$applname") + (string-append (assoc-ref outputs "out") + "/share/arcan/appl")) + (("([\\([:blank:]]+)arcan " _ separator) + (string-append separator + (assoc-ref inputs "arcan") + "/bin/arcan ")) + (("([\\([:blank:]]+)basename " _ separator) + (string-append separator + (assoc-ref inputs "coreutils") + "/bin/basename ")) + (("([\\([:blank:]]+)date " _ separator) + (string-append separator + (assoc-ref inputs "coreutils") + "/bin/date ")) + (("([\\([:blank:]]+)ln " _ separator) + (string-append separator + (assoc-ref inputs "coreutils") + "/bin/ln ")) + (("([\\([:blank:]]+)mkdir " _ separator) + (string-append separator + (assoc-ref inputs "coreutils") + "/bin/mkdir ")) + (("([\\([:blank:]]+)true; " _ separator) + (string-append separator + (assoc-ref inputs "coreutils") + "/bin/true; ")) + (("([\\([:blank:]]+)\\[ " _ separator) + (string-append separator + (assoc-ref inputs "coreutils") + "/bin/[ ")))))))) + (inputs (list arcan coreutils)) + (home-page "https://durden.arcan-fe.com/") + (synopsis "Desktop Environment for Arcan") + (description + "Durden is a desktop environment for the Arcan Display Server. +It serves both as a reference showcase on how to take advantage of some of the +features in Arcan, and as an entry to the advanced-user side of the desktop +environment spectrum.") + (license (list license:bsd-3 license:expat license:cc-by3.0 + license:cc-by4.0 license:asl2.0))))) + (define-public xarcan (package (name "xarcan")