From patchwork Thu Feb 9 16:37:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46770 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 880A616544; Thu, 9 Feb 2023 16:39:41 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 BBCF91643E for ; Thu, 9 Feb 2023 16:39:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQ9wt-0002Ei-VY; Thu, 09 Feb 2023 11:39:04 -0500 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 1pQ9ws-0002D9-Rg for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQ9ws-0007a6-Hl for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQ9ws-0004NI-Cb for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61391] [PATCH 1/6] gnu: icedove-wayland: Use gexps. References: <20230209163006.28078-1-maxim.cournoyer@gmail.com> In-Reply-To: <20230209163006.28078-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Feb 2023 16:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61391 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61391@debbugs.gnu.org Cc: Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 61391-submit@debbugs.gnu.org id=B61391.167596068516658 (code B ref 61391); Thu, 09 Feb 2023 16:39:02 +0000 Received: (at 61391) by debbugs.gnu.org; 9 Feb 2023 16:38:05 +0000 Received: from localhost ([127.0.0.1]:33486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQ9vw-0004KW-Vj for submit@debbugs.gnu.org; Thu, 09 Feb 2023 11:38:05 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:43984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQ9vv-0004Jt-HJ for 61391@debbugs.gnu.org; Thu, 09 Feb 2023 11:38:03 -0500 Received: by mail-qt1-f170.google.com with SMTP id cr22so2547832qtb.10 for <61391@debbugs.gnu.org>; Thu, 09 Feb 2023 08:38:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gzKuW7ZxYUjOCYCZyyPtAX+MogXAZb0ThBRzyq98RZM=; b=DshYDLQ/7jzmA6fAHT+ZaxNq+tVBANp2feOMpUzoki3Snx5yw4/R+D7gnrAm23pQbX CwYeGgPaDDp7zzAE0AsfSriuSgxDGTHT6z9BjnRyM1+k1CGzebXtywBw2CwIgvGEFd8a hxf6zUfWwUOMvPURIj6dg/eqXizeBXN8k6RNnKFXsm7AM4NhH2i0SFVFlKJVKJGHKeIY OfHRWUSIpsjEEju86caZbtQu+WVOE7LLSzA2pdjNwwuTSPB7+K2kbwwmvuAv/HFUYvw1 rn60g1v8X0Z8/7eGcursLb0m1JIM12wBgM2NOMM2A38ERRX6owMDSnGJQJnAz35RHSjy vJ9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gzKuW7ZxYUjOCYCZyyPtAX+MogXAZb0ThBRzyq98RZM=; b=L4btiwjXh1NuhvsEsuVmr0JqzaCWJ/+UCDGICu9xrOPxYVBl71Bm41v+JfX5tt+Sas CTpCZEaYlSBkG6QlU9CBp0sX9/75hRRE64BmgaU2mMoPOjUEI3xwrtxF/gT2aF7r/lPe 7nV4/u7aBb2sKo9wlErjl89/VZVYHNqec4veZh516yr2j9ahwKiOs139cHr7kWQwmw72 g5sd6xPa+8/youSEJuTkOn3a2zuRq4mbaGG8Rov8v7pdUPM2yXyGiHf1bLifK5Rq7eeh mn5ndM+MIzph/1xS4VXTVW/FMCWQ9b6NfOsE96gM6wzGTL/c4Bx1qi6GqX+TjQ5GNAUm /kJA== X-Gm-Message-State: AO0yUKV1osFSB7I5cWr6+jWVvzR8RcC5MlB2if8R5G6mbgzKbXY0Cm1U ogHZMNwXDuH69Fx9G4pMKeY03wzUKNByXah3 X-Google-Smtp-Source: AK7set8yyUBLsuYL65iVrdsA28X4k3fwUWsWx7RtBOWJsiR/2vnjD3nfFpf0lTqXhVqkjAf4fMQOUA== X-Received: by 2002:ac8:59cf:0:b0:3b9:bc26:3329 with SMTP id f15-20020ac859cf000000b003b9bc263329mr20707939qtf.64.1675960677855; Thu, 09 Feb 2023 08:37:57 -0800 (PST) Received: from localhost.localdomain (dsl-151-105.b2b2c.ca. [66.158.151.105]) by smtp.gmail.com with ESMTPSA id 21-20020ac856f5000000b003a6a19ee4f0sm1548116qtu.33.2023.02.09.08.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 08:37:57 -0800 (PST) From: Maxim Cournoyer Date: Thu, 9 Feb 2023 11:37:38 -0500 Message-Id: <20230209163744.28973-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnuzilla.scm (icedove/wayland) [inputs]: Set to the empty list. [arguments]: Use gexps. --- gnu/packages/gnuzilla.scm | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 0b39774a2e..15472ffed2 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1420,37 +1420,30 @@ (define-public icedove/wayland (package (inherit icedove) (name "icedove-wayland") - (native-inputs '()) - (inputs - `(("bash" ,bash-minimal) - ("icedove" ,icedove))) (build-system trivial-build-system) (arguments - '(#:modules ((guix build utils)) - #:builder - (begin + (list + #:modules '((guix build utils)) + #:builder + #~(begin (use-modules (guix build utils)) - (let* ((bash (assoc-ref %build-inputs "bash")) - (icedove (assoc-ref %build-inputs "icedove")) - (out (assoc-ref %outputs "out")) - (exe (string-append out "/bin/icedove"))) + (let* ((exe (string-append #$output "/bin/icedove"))) (mkdir-p (dirname exe)) - (call-with-output-file exe (lambda (port) (format port "#!~a MOZ_ENABLE_WAYLAND=1 exec ~a $@" - (string-append bash "/bin/bash") - (string-append icedove "/bin/icedove")))) + #$(file-append bash-minimal "/bin/bash") + #$(file-append icedove "/bin/icedove")))) (chmod exe #o555) - ;; Provide the manual and .desktop file. - (copy-recursively (string-append icedove "/share") - (string-append out "/share")) - (substitute* (string-append - out "/share/applications/icedove.desktop") - ((icedove) out)) - #t)))))) + (copy-recursively (string-append #$icedove "/share") + (string-append #$output "/share")) + (substitute* (string-append #$output + "/share/applications/icedove.desktop") + ((#$icedove) #$output)))))) + (native-inputs '()) + (inputs '()))) (define-public firefox-decrypt (package