From ac7627e62dac6b1cfe608b646dacf180a21a218f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 19 May 2022 22:46:52 +0200 Subject: [PATCH] gtk4: Fix incorrect merge For some reason, https://github.com/NixOS/nixpkgs/commit/17a8a7deacaea8a5490ae2316d947982c86052c8 re-introduced the patch, even though it was removed in https://github.com/NixOS/nixpkgs/commit/ff29d2caa935a8e6216380dfcd7ee714fd8bd5bf. --- pkgs/development/libraries/gtk/4.x.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 92f1df9d65d..e67599e0555 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -2,7 +2,6 @@ , stdenv , substituteAll , fetchurl -, fetchpatch , pkg-config , gettext , graphene @@ -78,15 +77,6 @@ stdenv.mkDerivation rec { sha256 = "p5orvMeTG3A/xPofy+G5BuIpoVIthU1SKAF2anm8rJ8="; }; - patches = [ - # Fix GNOME Control Center crash. - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4670 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/ae0166973795e750f08b89f9f0ef974d7ac48bc7.patch"; - sha256 = "qPOplocE+RcTFIEveJe8YLKiUpe7o6CiA834rZpS0Fs="; - }) - ]; - nativeBuildInputs = [ gettext gobject-introspection