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 96C9EAE6D; Fri, 26 Jun 2026 18:55:31 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id E2E1BADF1; Fri, 26 Jun 2026 18:55:26 +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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-43171.protonmail.ch (mail-43171.protonmail.ch [185.70.43.171]) by atuin.qyliss.net (Postfix) with ESMTPS id 91CC4AE24 for ; Fri, 26 Jun 2026 18:55:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=colbyt.com; s=protonmail; t=1782500124; x=1782759324; bh=0wHSk8lX8dSd7I++pxvrITAdY6XdkHDpeZTwE9ZbLEQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=IQEcacB4I7g5YKnFbVbKB6ffgfY1Bqe53HOsKxPC7X6ES0KGTXLWZfsK8E4uWq+OJ 9oSj2yiolXeQskxmlxJ9ijDRan2sS2sbQ350t4KRFFuMSR0qz2kex9E+GnAggjC4AA 2c7FyBNxlcSXMxGSEHBMD9VWligwsFaxIkxlJ1JAMjBuUlnw1ZSI9ploTHHn/ZZn3U JhHdhPgq2wt5PUr0q7xn+TTU0VTQ2Iua/SNhcwwt3p+M7vx7cEemP0t8Nluphrs9lZ 6nKYhjqtEsTuSWij0FbMHkAJOP1hxKjdwkiR5z8FFl4QvhtT0SfFhmNLXJR+UqEaiD NRlp3+y1cEtew== X-Pm-Submission-Id: 4gn4cV6PGPz2Sd3F From: colbyt To: devel@spectrum-os.org Subject: [PATCH 4/8] pkgs/gtk3: skip integrated Wayland backport Date: Fri, 26 Jun 2026 11:55:04 -0700 Message-ID: <20260626185509.3715326-5-colby@colbyt.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260626185509.3715326-1-colby@colbyt.com> References: <20260626185509.3715326-1-colby@colbyt.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 7N4TAT4MCPYAFQYT7D3UZJS26UPM5XLP X-Message-ID-Hash: 7N4TAT4MCPYAFQYT7D3UZJS26UPM5XLP X-MailFrom: colby@colbyt.com 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: colbyt 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: 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 @@ import ../../lib/overlay-package.nix [ "gtk3" ] ({ final, super }: -super.gtk3.overrideAttrs ({ patches ? [], ... }: { - patches = patches ++ [ +super.gtk3.overrideAttrs ({ patches ? [], version, ... }: { + patches = patches ++ final.lib.optionals (final.lib.versionOlder version "3.24.52") [ (final.fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/8569e206badbee1b27ff0e27316391b8d8c3f987.patch"; hash = "sha256-OdBhCGtz+3HS8LRhp+GCj3dL4pntybiI9b3A3kc5+OY="; -- 2.54.0