From patchwork Mon Dec 27 05:13:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 35678 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 6E47927BBEA; Mon, 27 Dec 2021 05:14:24 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED 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 EA4D027BBE9 for ; Mon, 27 Dec 2021 05:14:23 +0000 (GMT) Received: from localhost ([::1]:34392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1iL1-0007NA-1r for patchwork@mira.cbaines.net; Mon, 27 Dec 2021 00:14:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1iKg-0007N2-GV for guix-patches@gnu.org; Mon, 27 Dec 2021 00:14:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58764) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1iKf-0002Bc-QD for guix-patches@gnu.org; Mon, 27 Dec 2021 00:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1iKf-0006ZF-Md for guix-patches@gnu.org; Mon, 27 Dec 2021 00:14:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52806] [PATCH v2] gnu: Add xinitrc-xsession. References: In-Reply-To: Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Dec 2021 05:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52806 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "52806@debbugs.gnu.org" <52806@debbugs.gnu.org> Received: via spool by 52806-submit@debbugs.gnu.org id=B52806.164058201125193 (code B ref 52806); Mon, 27 Dec 2021 05:14:01 +0000 Received: (at 52806) by debbugs.gnu.org; 27 Dec 2021 05:13:31 +0000 Received: from localhost ([127.0.0.1]:42077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1iKB-0006YH-Dk for submit@debbugs.gnu.org; Mon, 27 Dec 2021 00:13:31 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:44781) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1iK5-0006Xx-CV for 52806@debbugs.gnu.org; Mon, 27 Dec 2021 00:13:30 -0500 Date: Mon, 27 Dec 2021 05:13:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1640581998; bh=j9fTk9WQ77ZUF4SOvIaH6P0ej/NNCiCkR++DpobaG6U=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=MuBf3UQ5fzySTrADwfGCJfC3MtLRVgFoBTTbDCkQEnB2ul2EjzCT1M5bOSiWxTlYk KS4kpv3Ur/fJALK9G+4yYD/TTIU4x9jIiRIvYjoQByK44rsZVHrFtmMX/CESXC1vG2 JD671b+JAKzpU6PhsemLExWa96n/XAXn1/EatRqLe0EJRUGMbnHvujn7jdS/zNMDOf dzfYKvYcz9lrjaETjjwNgM0sMo58gpIH6cUOArLEjeYOy6YgV1cOIlBgMb6jP9rUPX wjBcl1XogqwcZWx4ma4db7X/Lyqg0OPh1/pKLv687GayZUO0Ta4LustP+iwPQzvryT rD1LOoC/J5bUQ== Message-ID: 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches I forgot to note in the description that ~/.xinitrc needs to be executable for this xsession to run. Attached is the revised patch. Thanks! John From 5a974cce288973199d891223b3d9b84b2c683bb0 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sun, 26 Dec 2021 11:43:26 -0500 Subject: [PATCH] gnu: Add xinitrc-xsession. * gnu/packages/wm.scm (xinitrc-xsession): New variable. --- gnu/packages/wm.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index c6881154fe..39c447c07d 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -48,6 +48,7 @@ ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 jgart ;;; Copyright © 2021 Disseminate Dissent +;;; Copyright © 2021 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,6 +72,7 @@ (define-module (gnu packages wm) #:use-module (guix git-download) #:use-module (guix build-system asdf) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) #:use-module (guix build-system meson) @@ -2317,6 +2319,43 @@ (define-public xclickroot button is pressed on the root window.") (license license:public-domain))) +(define-public xinitrc-xsession + (let ((commit "cbfc77a1ccaf07b7d8a35f4d8007c7102f365374")) + (package + (name "xinitrc-xsession") + (version "1-3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://aur.archlinux.org/xinit-xsession.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12nv3qyjhy2l9mcb547f414d8bj79mhdhsra0g8x7x71b1xxl15b")))) + (build-system copy-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'patch-xsession-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (xinitrc-helper (string-append out "/bin/xinitrcsession-helper"))) + (substitute* (string-append out "/share/xsessions/xinitrc.desktop") + (("Exec=xinitrcsession-helper") + (string-append "Exec=" xinitrc-helper))))))) + #:install-plan + '(("xinitrcsession-helper" "bin/") + ("xinitrc.desktop" "share/xsessions/")))) + (home-page "https://aur.archlinux.org/packages/xinit-xsession/") + (synopsis "Use ~/.xinitrc as an xsession from your display manager") + (description + "Allows @code{~/.xinitrc} to be run as a session from your display manager. +Make @code{~/.xinitrc} executable and use this package in your system +configuration to use this xsession.") + (license license:gpl3)))) + (define-public xmenu (package (name "xmenu") -- 2.34.1