From patchwork Wed Mar 30 18:02:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_Mei=C3=9Fner?= X-Patchwork-Id: 38221 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 1E4B527BBEA; Wed, 30 Mar 2022 19:14:03 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 9F8DD27BBE9 for ; Wed, 30 Mar 2022 19:14:02 +0100 (BST) Received: from localhost ([::1]:33156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZcpV-0002V2-K7 for patchwork@mira.cbaines.net; Wed, 30 Mar 2022 14:14:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZcfq-0005hZ-JU for guix-patches@gnu.org; Wed, 30 Mar 2022 14:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43004) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZcfq-0005SA-8n for guix-patches@gnu.org; Wed, 30 Mar 2022 14:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZcfq-0004fO-1O for guix-patches@gnu.org; Wed, 30 Mar 2022 14:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54641] [PATCH] gnu: xmonad-next: Change #:phases to gexp. Resent-From: Daniel =?utf-8?q?Mei=C3=9Fner?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Mar 2022 18:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54641@debbugs.gnu.org Cc: Daniel =?utf-8?q?Mei=C3=9Fner?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164866339017875 (code B ref -1); Wed, 30 Mar 2022 18:04:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 Mar 2022 18:03:10 +0000 Received: from localhost ([127.0.0.1]:36901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZcew-0004eC-Vr for submit@debbugs.gnu.org; Wed, 30 Mar 2022 14:03:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:39480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZceu-0004e2-Uw for submit@debbugs.gnu.org; Wed, 30 Mar 2022 14:03:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZceu-0004R8-O1 for guix-patches@gnu.org; Wed, 30 Mar 2022 14:03:04 -0400 Received: from out2.mail.ruhr-uni-bochum.de ([134.147.42.229]:51435) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZcer-0005NQ-W3 for guix-patches@gnu.org; Wed, 30 Mar 2022 14:03:04 -0400 Received: from mx2.mail.ruhr-uni-bochum.de (localhost [127.0.0.1]) by out2.mail.ruhr-uni-bochum.de (Postfix mo-ext) with ESMTP id 4KTDmq3sK2z8SPM for ; Wed, 30 Mar 2022 20:02:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ruhr-uni-bochum.de; s=mail-2017; t=1648663371; bh=u7CHM6oZRQ0AiVN/S3pGOgLr4FDmL2JRJxYYgo9CP68=; h=From:To:Cc:Subject:Date:From; b=H3ystNtPbIM847IYyDSY1/tKPiRlDmyyV2LV4VQx7cF324N5sneTKi0CWuzdk9aQ+ 7VGKLsNF3uZDwxg+mjhtEhU8+mn4bQojZVbGoxuYkV2e4m+8tYy6OMjFKaXwk1zDL4 QOj60n7U1ZZ9I+WS+lL3JtYMpE5Loug0Wqoavq5A= Received: from out2.mail.ruhr-uni-bochum.de (localhost [127.0.0.1]) by mx2.mail.ruhr-uni-bochum.de (Postfix idis) with ESMTP id 4KTDmq34ryz8SMF; Wed, 30 Mar 2022 20:02:51 +0200 (CEST) X-Envelope-Sender: X-RUB-Notes: Internal origin=IPv6:2a05:3e00:c:1001::8693:2aec Received: from mail2.mail.ruhr-uni-bochum.de (mail2.mail.ruhr-uni-bochum.de [IPv6:2a05:3e00:c:1001::8693:2aec]) by out2.mail.ruhr-uni-bochum.de (Postfix mi-int) with ESMTP id 4KTDmq1nHSz8SM1; Wed, 30 Mar 2022 20:02:51 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.104.1 at mx2.mail.ruhr-uni-bochum.de Received: from think.local (int-60-174.vpn.ruhr-uni-bochum.de [IPv6:2a05:3e00:c:5::a05:3cae]) by mail2.mail.ruhr-uni-bochum.de (Postfix) with ESMTPSA id 4KTDmp5pZBzDh13; Wed, 30 Mar 2022 20:02:50 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.104.2 at mail2.mail.ruhr-uni-bochum.de Date: Wed, 30 Mar 2022 20:02:34 +0200 Message-Id: <20220330180234.5533-1-daniel.meissner-i4k@ruhr-uni-bochum.de> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Received-SPF: pass client-ip=134.147.42.229; envelope-from=daniel.meissner-i4k@ruhr-uni-bochum.de; helo=out2.mail.ruhr-uni-bochum.de 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, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" Reply-to: Daniel =?utf-8?q?Mei=C3=9Fner?= X-ACL-Warn: , =?utf-8?q?Daniel_Mei=C3=9Fner_via_Guix-patches?= X-Patchwork-Original-From: =?utf-8?q?Daniel_Mei=C3=9Fner_via_Guix-patches?= via From: =?utf-8?q?Daniel_Mei=C3=9Fner?= X-getmail-retrieved-from-mailbox: Patches * gnu/packages/wm.scm (xmonad-next)[arguments]: Use #$output instead of %output and $#(package-name this-package) and $#(package-synopsis this-package) instead of name and synopsis. --- gnu/packages/wm.scm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3de760d7a6..d6e27f0677 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -51,6 +51,7 @@ ;;; Copyright © 2022 John Kehayias ;;; Copyright © 2022 Gabriel Wicki ;;; Copyright © 2022 Jai Vetrivelan +;;; Copyright © 2022 Daniel Meißner ;;; ;;; This file is part of GNU Guix. ;;; @@ -758,22 +759,24 @@ (define-public xmonad-next (inputs (list ghc-data-default-class ghc-setlocale ghc-x11)) (native-inputs (list ghc-quickcheck ghc-quickcheck-classes)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after - 'install 'install-xsession - (lambda _ - (let* ((xsessions (string-append %output "/share/xsessions"))) - (mkdir-p xsessions) - (call-with-output-file - (string-append xsessions "/xmonad.desktop") - (lambda (port) - (format port "~ + (list #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-xsession + (lambda _ + (let ((xsessions (string-append #$output "/share/xsessions"))) + (mkdir-p xsessions) + (call-with-output-file (string-append xsessions + "/xmonad.desktop") + (lambda (port) + (format port "~ [Desktop Entry]~@ Name=~a~@ Comment=~a~@ Exec=~a/bin/xmonad~@ - Type=Application~%" ,name ,synopsis %output))))))))) + Type=Application~%" + #$(package-name this-package) + #$(package-synopsis this-package) + #$output))))))))) (home-page "https://xmonad.org") (description "Xmonad is a tiling window manager for X. Windows are arranged