From patchwork Sat May 14 22:11:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 39262 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 ED2AC27BBEA; Sat, 14 May 2022 23:33:22 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 C1F1D27BBE9 for ; Sat, 14 May 2022 23:33:22 +0100 (BST) Received: from localhost ([::1]:57656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq0K9-0005Pw-QQ for patchwork@mira.cbaines.net; Sat, 14 May 2022 18:33:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq0Jr-0004ua-AW for guix-patches@gnu.org; Sat, 14 May 2022 18:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53772) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq0Jr-0008Mp-1o for guix-patches@gnu.org; Sat, 14 May 2022 18:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq0Jq-0001nw-VD for guix-patches@gnu.org; Sat, 14 May 2022 18:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55419] [PATCH 4/5] gnu: emacs-no-x-toolkit: Use new package style. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 May 2022 22:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55419 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55419@debbugs.gnu.org Received: via spool by 55419-submit@debbugs.gnu.org id=B55419.16525675706887 (code B ref 55419); Sat, 14 May 2022 22:33:02 +0000 Received: (at 55419) by debbugs.gnu.org; 14 May 2022 22:32:50 +0000 Received: from localhost ([127.0.0.1]:47664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0Je-0001mv-Jg for submit@debbugs.gnu.org; Sat, 14 May 2022 18:32:50 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:42753) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0Ja-0001m0-OC for 55419@debbugs.gnu.org; Sat, 14 May 2022 18:32:47 -0400 Received: by mail-ej1-f65.google.com with SMTP id i27so22264280ejd.9 for <55419@debbugs.gnu.org>; Sat, 14 May 2022 15:32:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=RYDGJCCxu9ImClh8oZOSGnoBtrfqWktIld3cIp+w5u8=; b=LeIEYYFho596VAezUc1ux3Ixfmt0UpzM5orurzJPz7INbkNicnwtvU4UDUXSlCpqil M5kLDH8eXTOvrqoJmeDiiHppqngyGMNEpFopzu0SHmIvDcPQtQOcMadopyxmVSIeh4aO g4ZikW1hmfEHONsGzSsTiQp7+JjE/EUfV1iZxnOPUK5lOKYHkkHxxSUBMn69tGHbVTR/ 4dZ/znlNypJBtvNg/gwt4P07TKLGIVyBOIMtEHhXaokmzGk8PgZ05ljVS4Wz3xazqUGT kaZfMSP3HLdQu4sWgSFfjp2260Q4HA+ageazld/OWprg4ZxGkS+koJ6pMF0k5PkFFM4i 7vsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=RYDGJCCxu9ImClh8oZOSGnoBtrfqWktIld3cIp+w5u8=; b=hyaCJIbltBJ5edJjYXPKIZ8qK0xiqzZl0AD6MPtdd8FOAsKENP2lJe7LJR9sinHuDi PEpcXF2gjVWkhYMn3fAMytl39UiDbpJ2j9rOcSOy+ng3ve5/N/t5WPNCqXql4LEfNEyV vgEeGH/yV7q8VI24Wk4KySXhmdYXgqJPlA2MPENPi9k0EmhJ45N15Enfhaj2CxyzLhN8 NmaQIl72QOK7X2MvC5GDtbm0tBVbYOnVi8x5qpH3B1HLT7ebG36JdWAsHxyDxv7nYpAD 0kKAfxcSGdR7Jv3WC7GqUuq92t3mgStwSNDV2653mMGOE9kzEVSugFqRkwyABVEfwMyC LIlA== X-Gm-Message-State: AOAM532vU7hHpQ5gnsFTV8xkvPr+xDtRbJxyYElxtqd1mKHzqlKzBQNt cM/tqLSXX4MFFW4vE3APFJd7OXvvmGw= X-Google-Smtp-Source: ABdhPJwhEsP2U51ML92nph/AkS1SutO7caErwJ3VkDroDJw72h/coxa+ogeu5e7uL38wiqsAg092jw== X-Received: by 2002:a17:907:97c4:b0:6f8:5ec5:61e2 with SMTP id js4-20020a17090797c400b006f85ec561e2mr9882005ejc.559.1652567561267; Sat, 14 May 2022 15:32:41 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id qx16-20020a170907b59000b006f3ef214e53sm2064161ejc.185.2022.05.14.15.32.40 for <55419@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 15:32:40 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 15 May 2022 00:11:22 +0200 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs-no-x-toolkit)[arguments]: Convert to list of G-Expressions. [inputs]: Use modify-inputs. --- gnu/packages/emacs.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 027afc811a..392b3297b0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -428,14 +428,15 @@ (define-public emacs-no-x-toolkit (synopsis "The extensible, customizable, self-documenting text editor (without an X toolkit)" ) (build-system gnu-build-system) - (inputs (append `(("inotify-tools" ,inotify-tools)) - (alist-delete "gtk+" (package-inputs emacs)))) + (inputs (modify-inputs (package-inputs emacs) + (delete "gtk+") + (prepend inotify-tools))) (arguments (substitute-keyword-arguments (package-arguments emacs) - ((#:configure-flags flags ''()) - `(cons "--with-x-toolkit=no" ,flags)) + ((#:configure-flags flags #~'()) + #~(cons "--with-x-toolkit=no" #$flags)) ((#:phases phases) - `(modify-phases ,phases + #~(modify-phases #$phases (delete 'restore-emacs-pdmp) (delete 'strip-double-wrap)))))))