Re: [PATCH 4/8] pkgs/gtk3: skip integrated Wayland backport

[Alyssa Ross <hi@alyssa.is>]

[-- Attachment #1: Type: text/plain, Size: 1364 bytes --]

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

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 = "https://gitlab.gnome.org/GNOME/gtk/-/commit/8569e206badbee1b27ff0e27316391b8d8c3f987.patch";
>        hash = "sha256-OdBhCGtz+3HS8LRhp+GCj3dL4pntybiI9b3A3kc5+OY=";
> -- 
> 2.54.0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]