patches and low-level development discussion
 help / color / mirror / code / Atom feed
From: colbyt <colby@colbyt.com>
To: devel@spectrum-os.org
Cc: colbyt <colby@colbyt.com>
Subject: [PATCH 4/8] pkgs/gtk3: skip integrated Wayland backport
Date: Fri, 26 Jun 2026 11:55:04 -0700	[thread overview]
Message-ID: <20260626185509.3715326-5-colby@colbyt.com> (raw)
In-Reply-To: <20260626185509.3715326-1-colby@colbyt.com>

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 <colby@colbyt.com>
---
 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


  parent reply	other threads:[~2026-06-26 18:55 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-26 18:55 [PATCH 0/8] refresh nixpkgs for Linux 7.1 colbyt
2026-06-26 18:55 ` [PATCH 1/8] pkgs: fix aarch64-musl builds with current nixpkgs colbyt
2026-07-02 12:18   ` Alyssa Ross
2026-06-26 18:55 ` [PATCH 2/8] lib: update nixpkgs colbyt
2026-06-26 18:55 ` [PATCH 3/8] pkgs/skaware: vendor backported patches colbyt
2026-07-02 11:53   ` Alyssa Ross
2026-06-26 18:55 ` colbyt [this message]
2026-07-02 12:19   ` [PATCH 4/8] pkgs/gtk3: skip integrated Wayland backport Alyssa Ross
2026-06-26 18:55 ` [PATCH 5/8] pkgs/skaware: skip integrated backports colbyt
2026-06-26 18:55 ` [PATCH 6/8] pkgs/cloud-hypervisor: update GPU patchset to v52 colbyt
2026-06-26 18:55 ` [PATCH 7/8] pkgs/libfyaml: fix pkg-config libs colbyt
2026-06-26 18:55 ` [PATCH 8/8] vm-lib: allow app VMs to name closure roots colbyt
2026-07-02 13:38   ` Alyssa Ross
2026-07-02 23:40     ` colby
2026-07-03 14:02       ` Alyssa Ross
2026-06-26 18:55 ` [PATCH optional] linux: use 6.18 for generic images colbyt
2026-07-02 13:42   ` Alyssa Ross
2026-07-02 23:20     ` colby
2026-07-02 12:03 ` [PATCH 0/8] refresh nixpkgs for Linux 7.1 Alyssa Ross

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260626185509.3715326-5-colby@colbyt.com \
    --to=colby@colbyt.com \
    --cc=devel@spectrum-os.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://spectrum-os.org/git/crosvm
	https://spectrum-os.org/git/doc
	https://spectrum-os.org/git/mktuntap
	https://spectrum-os.org/git/nixpkgs
	https://spectrum-os.org/git/spectrum
	https://spectrum-os.org/git/ucspi-vsock
	https://spectrum-os.org/git/www

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).