From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id mOVdC/DM8GQhHAEAauVa8A:P1 (envelope-from ) for ; Thu, 31 Aug 2023 19:25:04 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id mOVdC/DM8GQhHAEAauVa8A (envelope-from ) for ; Thu, 31 Aug 2023 19:25:04 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AF4D145697 for ; Thu, 31 Aug 2023 19:25:03 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1693502703; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Sv1AUOGCuREUu4jB5mGVCt6NDI4Qo1Ktpl6EvWyJ6iI=; b=d+5hHQ3li4xRoamzuHv49rWA0jKqnY3nH8k1CJ/xVT9oRSWSQxDqeMq5pxHopqemBM+5Ex E5QWql+2dNR8r9WvdXkrD2nEBpsX0rc619dJprDN2CX1oMw+ytOpdj8Hrdnbz3G59l/9UB Mn9d8W/aOHeVe/CM9rUdqF44zt055ivk3U1StzsUV0YJm8lWrF8JvH/pQuh8lo9rB99BzV t2kdHWXqV4b1g6zXeSUZ1Og9is8kmjbURFNT29JcWoo8Xfp8nfMV249YqsBH2GQyax9Ljk kIKicMWy5ob0kPY0Zb5P/bT+FxL10UdexwOFfjNHrtWuHBSA5cfWvaN3f6QRGQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1693502703; a=rsa-sha256; cv=none; b=VVvcGgOkJPf8TgjarmkP4jywgvV9VJkLp7FIe1ZZtf1OCtDHXJe7Sua8s514tyJ+HeH1LT xOTAC4h/mO6YO7ZSjkGr77dNDzL74LHtMdKa8UNJUpUSizQgn/Zmj5gJPZAZ2ecGB8cAEV UuE8/sPBGPfEWrLWLadwWuXXYDh3+fgtRvbzCmOPuU5Z5MfzTYCr6OGOL9KgJyWkEBIiY2 tzoHBaH2Ihxm70d1b2YNNv5rlr3T2zDxIAK4CD5N0Nol9N61b86Oh36gdbvBPnL84jmLrF E5JHUZHvnPdvBfKDt+qhH1YLSgS99FXAW/Jcev93COYvG1Z7wjv8yiVL2NscNQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qblPc-0001BF-0Q; Thu, 31 Aug 2023 13:24:56 -0400 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 1qblPZ-0001Ar-Ow for guix-patches@gnu.org; Thu, 31 Aug 2023 13:24:53 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qblPZ-0000J7-G5 for guix-patches@gnu.org; Thu, 31 Aug 2023 13:24:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qblPh-0003xY-Nf for guix-patches@gnu.org; Thu, 31 Aug 2023 13:25:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65661] [PATCH] gnu: ungoogle-chromium-wayland: Use gexp. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Aug 2023 17:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65661@debbugs.gnu.org Cc: ngraves@ngraves.fr X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169350266915175 (code B ref -1); Thu, 31 Aug 2023 17:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Aug 2023 17:24:29 +0000 Received: from localhost ([127.0.0.1]:56953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qblPA-0003wg-Gz for submit@debbugs.gnu.org; Thu, 31 Aug 2023 13:24:29 -0400 Received: from lists.gnu.org ([2001:470:142::17]:37448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qblP8-0003wT-Dr for submit@debbugs.gnu.org; Thu, 31 Aug 2023 13:24:27 -0400 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 1qblOu-0000vG-Ps for guix-patches@gnu.org; Thu, 31 Aug 2023 13:24:12 -0400 Received: from 10.mo581.mail-out.ovh.net ([178.33.250.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qblOr-0008PZ-VP for guix-patches@gnu.org; Thu, 31 Aug 2023 13:24:12 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.156.62]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 5838D278DA for ; Thu, 31 Aug 2023 17:23:59 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-4cgn8 (unknown [10.110.115.90]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 0A52D1FDDB; Thu, 31 Aug 2023 17:23:58 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-6684bf9d7b-4cgn8 with ESMTPSA id PGV0Oq7M8GTblgEAOxz9dw (envelope-from ); Thu, 31 Aug 2023 17:23:58 +0000 X-OVh-ClientIp: 81.67.140.142 Date: Thu, 31 Aug 2023 19:23:54 +0200 Message-ID: <5ed3deb8607ad06d3aae6099a056631c56f6a3e2.1693502634.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 14749007308096791266 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudegtddgudduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepteevheffvedvgfdttdehvdfhgeeugfegffetteeuleeivdfhhfejgeduheelgeehnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdelheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedupdhmohguvgepshhmthhpohhuth Received-SPF: pass client-ip=178.33.250.56; envelope-from=ngraves@ngraves.fr; helo=10.mo581.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.72 X-Spam-Score: -6.72 X-Migadu-Queue-Id: AF4D145697 X-Migadu-Scanner: mx2.migadu.com X-TUID: 70R1NVB3vROV * gnu/packages/chromium.scm (ungoogle-chromium-wayland): Use gexp. [arguments](builder): Use gexp. [inputs]: Rewrite inputs. --- gnu/packages/chromium.scm | 60 +++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 6a9f113831..513e545938 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019-2023 Marius Bakke ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2023 Andreas Enge +;;; Copyright © 2023 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -966,42 +967,39 @@ (define-public ungoogled-chromium/wayland (name "ungoogled-chromium-wayland") (native-inputs '()) (inputs - `(("bash" ,bash-minimal) - ("glibc-locales" ,glibc-utf8-locales) - ("ungoogled-chromium" ,ungoogled-chromium))) + (list bash-minimal glibc-utf8-locales ungoogled-chromium)) (build-system trivial-build-system) (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let* ((bash (assoc-ref %build-inputs "bash")) - (chromium (assoc-ref %build-inputs "ungoogled-chromium")) - (locales (assoc-ref %build-inputs "glibc-locales")) - (out (assoc-ref %outputs "out")) - (exe (string-append out "/bin/chromium"))) + (list + #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) + (let* ((bash #$(this-package-input "bash-minimal")) + (chromium #$(this-package-input "ungoogled-chromium")) + (locales #$(this-package-input "glibc-utf8-locales")) + (exe (string-append #$output "/bin/chromium"))) - ;; Use a Unicode locale so we can substitute the file below. - (setenv "GUIX_LOCPATH" (string-append locales "/lib/locale")) - (setlocale LC_ALL "en_US.utf8") + ;; Use a Unicode locale so we can substitute the file below. + (setenv "GUIX_LOCPATH" (string-append locales "/lib/locale")) + (setlocale LC_ALL "en_US.utf8") - (mkdir-p (dirname exe)) - (symlink (string-append chromium "/bin/chromedriver") - (string-append out "/bin/chromedriver")) + (mkdir-p (dirname exe)) + (symlink (string-append chromium "/bin/chromedriver") + (string-append #$output "/bin/chromedriver")) - (call-with-output-file exe - (lambda (port) - (format port "#!~a + (call-with-output-file exe + (lambda (port) + (format port "#!~a exec ~a --enable-features=UseOzonePlatform --ozone-platform=wayland \ --enable-features=WebRTCPipeWireCapturer $@" - (string-append bash "/bin/bash") - (string-append chromium "/bin/chromium")))) - (chmod exe #o555) + (string-append bash "/bin/bash") + (string-append chromium "/bin/chromium")))) + (chmod exe #o555) - ;; Provide the manual and .desktop file. - (copy-recursively (string-append chromium "/share") - (string-append out "/share")) - (substitute* (string-append - out "/share/applications/chromium.desktop") - ((chromium) out)) - #t)))))) + ;; Provide the manual and .desktop file. + (copy-recursively (string-append chromium "/share") + (string-append #$output "/share")) + (substitute* (string-append + #$output "/share/applications/chromium.desktop") + ((chromium) #$output)))))))) base-commit: cf6abf50dbbbd95fef465ab4bb3b608843ac47e1 prerequisite-patch-id: cccdad83975cbf04d7bd618c2c1a4b4de6fa7fd2 prerequisite-patch-id: 6f28833d2efa054d55126980f87ba4d2fdd13c6d prerequisite-patch-id: afc6cadece838372370f7093f863ce8eaae7bc55 prerequisite-patch-id: b9330c12700355319c104aa3b493eafe03cbb619 prerequisite-patch-id: 46fa9c5a48fcc5b13409049b14b6e7314a6d6956 prerequisite-patch-id: 846f8b50b8de749caaa459b874087d06e15e0a80 prerequisite-patch-id: 023101e5a315951ce9786fb8230955c97001dac9 prerequisite-patch-id: d4b0193f128d8236026e079e746ea0cf6c4c0af0 prerequisite-patch-id: d73442d6d7c88e7375e9de0a9cd655cacb7766f9 prerequisite-patch-id: d8a56dd7bc6c1c3ba3ac0f77b2402b9c6469cfb2 prerequisite-patch-id: 3bc2b2eecd799be8d8b0f96b850ef83a6306dab7 prerequisite-patch-id: 798d4a277eff03a59339af4ebe19406682f361ab prerequisite-patch-id: 3f65e9cdab64edeacfeb5748cd4fb130839b2b30 prerequisite-patch-id: 6f8225b63a1dd1866b05bb91544e49d7c096601c prerequisite-patch-id: ff71ec9bdf6337390a720db4535268af271e32df prerequisite-patch-id: c6b40cc38f5bdfab229ac3d7ed4346c5d9f1b2f7 prerequisite-patch-id: 9ab6dade9e641d5e667ba6a61dbfbb3d32c943a6 prerequisite-patch-id: 4fcae29a8f6dd95716669680141da315acaf6e59 prerequisite-patch-id: 0a5a6da0061188dc9be59bc9829db53288307c58 prerequisite-patch-id: 83c4b7d9d831990e4d37ba89c584d773c872ba6b prerequisite-patch-id: 1c8dddf99041cf399b8836e3ad6721d7bbcebb7c prerequisite-patch-id: 773df13cc85606b205d1d914e59525b7a6820a1d prerequisite-patch-id: 6f8974ce8c0a3a25721a41781f9b0dfd61e96cf4 prerequisite-patch-id: d219948d28923c5ccd34b63f988032df33f2f336 prerequisite-patch-id: 0bd75bb28df9ccf3405caf8217d708afc978047d prerequisite-patch-id: 26476dd782cf8f5e427d4bd36ac85957538a0aa3 prerequisite-patch-id: b5f87c460fd984c41fbb52e7e0dc305c20c46f22 prerequisite-patch-id: 5502b9c6a64abaca6a9921f25cd324869d26aa1e prerequisite-patch-id: a7e84bb368349566e9a6fdbe49a371fdb464bb1e prerequisite-patch-id: a84a766ceef6bedd5da3f9512c87a2c2a11ff33f prerequisite-patch-id: 0175b2b1cbbc15c1c775147821715bca9e3303a3 prerequisite-patch-id: 9c20b408ac8aa275ecba58383d83be5cef7647df prerequisite-patch-id: 836749cd3bd3b86f64de637c3c2df48a3608f09f prerequisite-patch-id: 28ea1ddbef32a1bc9e908f3f9c7466953c60f13d prerequisite-patch-id: 52a78e387e36e6408d7147950195d552e4e41528 prerequisite-patch-id: 87fee01a70d4b8cbfca44cc0a9c9f54471a92d18 prerequisite-patch-id: 8c8cdb345e815fc3332805ca224103f185d4a568 prerequisite-patch-id: 3434c5caf1eba9e9a64c673681e5911d2c1d9232 prerequisite-patch-id: c45bf303726fb3dacee01a66c0ff75105a81164d prerequisite-patch-id: d44a1adb0404f23522aac21fa8a7f26be7ddabdc prerequisite-patch-id: e422fe29bbcef80260b190637faa1a4953c3f1cb prerequisite-patch-id: 285479a1a1e46e6f0f8aba5429edfa400c81b32b prerequisite-patch-id: 30fcff6f8c9328c71d3fca609cddde0b56973bb7 prerequisite-patch-id: 70bb47ccac3375de893e4e640ce7c59369a05a39 prerequisite-patch-id: cc3d79386ca4a93146dc195cd5732764f1ac447f prerequisite-patch-id: 2686866ec4bf08c7faa05b17cb84d9e0c13ec12c prerequisite-patch-id: 369b61e07e3c90151a5414b784513b9ae3d3e978 prerequisite-patch-id: 065651c3a8cee63b725d7f86c080c274b494627e prerequisite-patch-id: 1ee71844f0c9a0112a456e5b76079239906a7fb8 prerequisite-patch-id: c7b3d9c5bff04c16576781eff50ce37f7c49131c prerequisite-patch-id: c8b8fe8dc51fea0b8a2626cf7031f01b6000e023 prerequisite-patch-id: 182e25335d4c357001f4f8bed2b3f89b91d9cae5 prerequisite-patch-id: c0ea00d5f4c6a83642a92c9341f0288fbfe3095a prerequisite-patch-id: 795d31cc33a24a6a57e67af31b65acd8faa8187c prerequisite-patch-id: 358af8aa7fa71b5cb8fbe6dde29d141bb7c57f1e prerequisite-patch-id: b9ab3ee98a9d4ca518a4d99042982d64fbce5d05 prerequisite-patch-id: eb618ab7b10483d917c308a38792af98baa517e2 prerequisite-patch-id: 40b6c9f09f27833367a71ec25d77afae4d2a835e prerequisite-patch-id: 45e65ea00ece53f3496251401acd464081f8ca7a prerequisite-patch-id: c12968d02d99c253f858586a86b16fa32d41f1c1 prerequisite-patch-id: 09d995d48139f8e61183d5634cda13a01cdb50f7 prerequisite-patch-id: 86baa45ec2aad977c8c8135f7613aa391155de6d prerequisite-patch-id: 3425fbbff6a603d60b4e143ea2141aabf4ddc92c prerequisite-patch-id: c373c01aab5dcba3503a97d51c62a595147a041c prerequisite-patch-id: cda857c790b88c681c4e713c5f71e40291970daf prerequisite-patch-id: c786776c23138d1f9b29aea86c3ba266a8fd61a3 prerequisite-patch-id: 48eda92adef9c867b3eda7e7209615f9721a65c1 prerequisite-patch-id: a0eca3c5fbca32478f478f784f0746eb34e7db77 prerequisite-patch-id: 8e234d0f4d93d2aad499eec8842be3d28da98707 prerequisite-patch-id: 5f664cb2fd995a53765c5ffc19a708ac795cc0c4 prerequisite-patch-id: ed447cba9cf9b7e1a1b47aa27acb14f8f2da0a8e -- 2.41.0