From patchwork Sat May 14 22:10:19 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: 39260 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 A0AEB27BBEA; Sat, 14 May 2022 23:33:12 +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 7205F27BBE9 for ; Sat, 14 May 2022 23:33:12 +0100 (BST) Received: from localhost ([::1]:56954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq0Jz-0004vo-JY for patchwork@mira.cbaines.net; Sat, 14 May 2022 18:33:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq0Jq-0004sY-Ik for guix-patches@gnu.org; Sat, 14 May 2022 18:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53770) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq0Jq-0008Mc-9c for guix-patches@gnu.org; Sat, 14 May 2022 18:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq0Jq-0001ni-6d for guix-patches@gnu.org; Sat, 14 May 2022 18:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55419] [PATCH 2/5] gnu: emacs-xwidgets: 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.16525675676864 (code B ref 55419); Sat, 14 May 2022 22:33:02 +0000 Received: (at 55419) by debbugs.gnu.org; 14 May 2022 22:32:47 +0000 Received: from localhost ([127.0.0.1]:47659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0Jb-0001mZ-3s for submit@debbugs.gnu.org; Sat, 14 May 2022 18:32:47 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:34523) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0JZ-0001lx-Ka for 55419@debbugs.gnu.org; Sat, 14 May 2022 18:32:45 -0400 Received: by mail-ej1-f65.google.com with SMTP id g6so22338123ejw.1 for <55419@debbugs.gnu.org>; Sat, 14 May 2022 15:32:45 -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=uTIXZX5cnQPFq5SFh9ZgbNb7YJooRISDDnLevd2H7w4=; b=ktS0Sb1RVvJAy+6ZABh4PlyzAHtAMgtApdFBF9YjguFICAt79JyeoB974+cdoiVb8t JZvhJcdMHKEiqofQ3e3vpcdN/OF6pI87R9zO4tbQdGEvMJP+Drl2sNk0alkMZFmEClLU 7PHpuSba5azjA0SJ3l7JMNrTMQaBPxObRwLmdx8WmIJbNF2x4CjG7e6qzmZo2Lz+3/PJ dg9fKRCv257rkX82Y2WVs+tggDmzSIZwpPQ9G3ZF1CEvrTNBE1fMztYbnH44lBC8P7Z7 c3DoX89ErqHtaJY/e3p5kp3mef1BZPMhUXmEkcNDilO/QS9+Orf67S2OIR49mRmx9MAQ Ukww== 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=uTIXZX5cnQPFq5SFh9ZgbNb7YJooRISDDnLevd2H7w4=; b=iyRzkvGdTT6m9bO8hsf67MX8xif8JjiYCt9A5sSbuXHS8CzX1wQjaHdlFqhv8RSgAn sgHArMB27keTUJK+kK+Rb7Mkn5gvRHP69mhJ+5oid3u5+sFugg6wIlyN2nkXhfspv1HD uX052zBZaT89kTfK3/GOAHcfybBqXMI790t9JRDxpnqMHs9TSAP0fc6Iq2m0rnBONDze 43jkPI5T3x5+dF1uCtTwSaChsS99N3sNbjpbVI8ntfEzOElXuZLoNoX9c+vYlNVXlCaO 4CTeDOzXIomRlbvJwxY4bEkSRPO4OjwR/er9N/NkGIU8osJf/yv8dqeCLUC/6lAYNVPi QcVg== X-Gm-Message-State: AOAM533mrf92ktQY4Bc+7kQigYjEUQ0knraWKTOARjtuTsUoCfwpch4P RROHGsHiMi3Kn39RDu3U4GfXJDEjGjQ= X-Google-Smtp-Source: ABdhPJw5cNvFhoWANwTVkaZgSOnjz0vrI6fuSU8r2/UxdWLq3Ji3XITiYRzqTG091scqIOgJwEC6BQ== X-Received: by 2002:a17:907:9711:b0:6f4:6989:6afb with SMTP id jg17-20020a170907971100b006f469896afbmr9902838ejc.618.1652567560084; Sat, 14 May 2022 15:32:40 -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.39 for <55419@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 15:32:39 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 15 May 2022 00:10:19 +0200 Message-ID: <1ebe47f9ebc26746dce56d7b71094b067f98b0c4.camel@gmail.com> 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-xwidgets)[arguments]: Convert to list of G-Expressions. [inputs]: Use modify-inputs. --- gnu/packages/emacs.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index af902ac9f9..e3eba851ff 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -391,16 +391,15 @@ (define-public emacs-xwidgets (build-system gnu-build-system) (arguments (substitute-keyword-arguments (package-arguments emacs) - ((#:configure-flags flags ''()) - `(cons "--with-xwidgets" ,flags)) + ((#:configure-flags flags #~'()) + #~(cons "--with-xwidgets" #$flags)) ((#:phases phases) - `(modify-phases ,phases - (delete 'restore-emacs-pdmp) - (delete 'strip-double-wrap))))) + #~(modify-phases #$phases + (delete 'restore-emacs-pdmp) + (delete 'strip-double-wrap))))) (inputs - `(("webkitgtk" ,webkitgtk-with-libsoup2) - ("libxcomposite" ,libxcomposite) - ,@(package-inputs emacs))))) + (modify-inputs (package-inputs emacs) + (prepend webkitgtk-with-libsoup2 libxcomposite))))) (define-public emacs-no-x (package/inherit emacs