From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id C5845CEE3; Thu, 02 Jul 2026 12:19:36 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 98E3DCEDC; Thu, 02 Jul 2026 12:19:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_MISSING,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fhigh-b7-smtp.messagingengine.com (fhigh-b7-smtp.messagingengine.com [202.12.124.158]) by atuin.qyliss.net (Postfix) with ESMTPS id EF50DCEDB for ; Thu, 02 Jul 2026 12:19:32 +0000 (UTC) Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfhigh.stl.internal (Postfix) with ESMTP id B0BDD7A00EB; Thu, 2 Jul 2026 08:19:31 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Thu, 02 Jul 2026 08:19:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm1; t=1782994771; x=1783081171; bh=RyoqbsCD+G RMobvYwOiv11szDhzl2T8WtyXPTI5SQME=; b=MUov7jChxacP4Ud5OvW13eWHG4 U30cFKt+uX3grfZ1sfzBZ93LMZR8Upd/aQQM45rYYJeK+VpofF2ICfIJkciCxdK7 qPnSagLqF6VfW9CEyKM3LNxysM4gNJYnh92a9Low/sYCdKlbkPKxGvOJkNp4iCfT OhDngFOfvphkN9BF48YHTwyts+PPPrmJmgA9Yqn165XswwH32D9dLoOk6rP43lPk NrumxNI2dAFVSp9bD0mGRTawCPdwYYzNISJkJqdEZ3MtILHE5lFbZciQAYaHy10r mRLq6Zjxv3ZDs25jrgFImwSZ8MZYosBinzuob4AAOrwQgpbv0rvpOP3iBe4g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1782994771; x=1783081171; bh=RyoqbsCD+GRMobvYwOiv11szDhzl2T8WtyX PTI5SQME=; b=MJN9lHZEITZ8mhaqHhZihIsOVn8nRH8CztIuRgzOCCPYtOv4AER mjy2lzZ+diS9SEvfus6zSlIooKgEe9PRNi1r7n5rOOBnQOdrIp0t9qP9xnYtyUCY uazIdvNfvgJyPmZChE3IiwYUfNT4TOWNjbgBa6lUq3VK91GbFOD8bgrQPGly2JaI h52MQfNiTnlXbvPoyVpcAttvsfxrpx1xUCPyauyh3fSHtiVc2ADmZJEqYy4zVrnj ex05ywQ/xj9ybJedgibU2fwkwVB6b9v0i4zViW5sBEjtlRXDcSe6kf5PdgKk40Tw MtFbQHFLcuTAAyuKXF5t2quQ+BxxBn3iaBg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTGSsx2EVXnKvBXLf3haiSevja/C+o3iwrLwH6vWHXPfx8v8lCbBCbBZ/DOpadKUtm oXkEWTV9ZtZqCqhTfo0oKwUJa4qJoFtkgJGw6WyG6LpZ5gkaQffwDmuVMMC4hCEb8rZYtV VCzaqzhmg/OvKRD1cnrjYb50MQyATf9H8hnX/5XkuWWTwEWrlEB4VQUnp3fisnNxJf3vGT b3ZvHZ+qt54LcQzc7BnvszyZk94pQolMgu6YrEu/HwPPXZAVH/ldMd9/rqQhmpUBiJsjBa UIAfcGn5ccZrQb5fO8+29mRW3uo71j4JDsIkvjxNhqezwzQ0Z7GtZsE0H9NYg98LJRwtAh s25u58A9x9emsWkE3v1wiAPMNzr2ZwhgS5vyZsB3zWCa26qt/YReBFLgcXv0nSRh8er/zR QFcY7kUngRPrTlzizdkiZb6YDdzNOa1CkhLmodYAvVR7vM+fUSAfkjfSzGmN+gMtn+gECn WZeOmaFI3Y0J19nSQniwhVCfuUjZuMRpinI/tILbTlaFg+hITR3CgFgCejLz04YSVG8koi t8rcxbKP+cABkY7RCOWspOG4VRfIT6PwwOsRku57xAxbxZNIGy/sn8We8i5T09Jm9o1KMu AtgP5oPn94F9krxnoZucoj1GNNh4yLo9ocYEVuJRcc7Xig5bGkBljfvOECVA X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 2 Jul 2026 08:19:31 -0400 (EDT) Received: by mbp.qyliss.net (Postfix, from userid 1000) id 9380E845F844; Thu, 02 Jul 2026 14:19:29 +0200 (CEST) From: Alyssa Ross To: colbyt Subject: Re: [PATCH 4/8] pkgs/gtk3: skip integrated Wayland backport In-Reply-To: <20260626185509.3715326-5-colby@colbyt.com> References: <20260626185509.3715326-1-colby@colbyt.com> <20260626185509.3715326-5-colby@colbyt.com> Date: Thu, 02 Jul 2026 14:19:29 +0200 Message-ID: <87pl15wpm6.fsf@alyssa.is> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Message-ID-Hash: ZS46DMEKEV6VMSKD3FBZOKAIFUB2E4GG X-Message-ID-Hash: ZS46DMEKEV6VMSKD3FBZOKAIFUB2E4GG X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: devel@spectrum-os.org X-Mailman-Version: 3.3.10 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable colbyt writes: > The updated nixpkgs pin already contains the GTK Wayland backport carried > by Spectrum. > > Drop the local patch from the package override so the build does not try > to apply an already-integrated change. > > Signed-off-by: colbyt > --- > pkgs/gtk3/default.nix | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/pkgs/gtk3/default.nix b/pkgs/gtk3/default.nix > index 72445c9..47c5a14 100644 > --- a/pkgs/gtk3/default.nix > +++ b/pkgs/gtk3/default.nix > @@ -3,8 +3,8 @@ >=20=20 > import ../../lib/overlay-package.nix [ "gtk3" ] ({ final, super }: >=20=20 > -super.gtk3.overrideAttrs ({ patches ? [], ... }: { > - patches =3D patches ++ [ > +super.gtk3.overrideAttrs ({ patches ? [], version, ... }: { > + patches =3D patches ++ final.lib.optionals (final.lib.versionOlder ver= sion "3.24.52") [ There shouldn't be any need for version checks like this, because we don't support building with older Nixpkgs versions. Once we've upgraded, backports like this can just be deleted. (The goal is to be applying 0 patches in Spectrum!) > (final.fetchpatch { > url =3D "https://gitlab.gnome.org/GNOME/gtk/-/commit/8569e206badbe= e1b27ff0e27316391b8d8c3f987.patch"; > hash =3D "sha256-OdBhCGtz+3HS8LRhp+GCj3dL4pntybiI9b3A3kc5+OY=3D"; > --=20 > 2.54.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRV/neXydHjZma5XLJbRZGEIw/wogUCakZXUQAKCRBbRZGEIw/w ongjAQDR3qSGNZ7gnnDnHor9XC8SXgDGl+19MhqFulBVouCXrwEA8hB9fX4OZUlj Nv4w3n8iDwxBmq/1Q4uALkujRAwW7Aw= =653V -----END PGP SIGNATURE----- --=-=-=--