From 724822a79dc6fee025f246bda73b61239e89034c Mon Sep 17 00:00:00 2001
From: piegames <git@piegames.de>
Date: Sat, 15 Jan 2022 23:19:32 +0100
Subject: [PATCH] python2Packages.{pygtk,pyGtkGlade}: remove libglade support

---
 pkgs/development/python2-modules/pygtk/default.nix | 6 +++---
 pkgs/top-level/python-aliases.nix                  | 1 +
 pkgs/top-level/python2-packages.nix                | 4 ----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python2-modules/pygtk/default.nix b/pkgs/development/python2-modules/pygtk/default.nix
index 938b55630c0..465d711ec6f 100644
--- a/pkgs/development/python2-modules/pygtk/default.nix
+++ b/pkgs/development/python2-modules/pygtk/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, fetchpatch, python, pkg-config, gtk2, pygobject2, pycairo, pango
-, buildPythonPackage, libglade ? null, isPy3k }:
+, buildPythonPackage, isPy3k }:
 
 buildPythonPackage rec {
   pname = "pygtk";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     pango
-  ] ++ lib.optional (libglade != null) libglade;
+  ];
 
   propagatedBuildInputs = [ gtk2 pygobject2 pycairo ];
 
@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   installPhase = "installPhase";
 
-  checkPhase = lib.optionalString (libglade == null)
+  checkPhase =
     ''
       sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \
              tests/common.py
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index e8416f91109..a221e083fa3 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -72,6 +72,7 @@ mapAliases ({
   prometheus_client = prometheus-client; # added 2021-06-10
   prompt_toolkit = prompt-toolkit; # added 2021-07-22
   pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08
+  pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15
   pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
   pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
   pysmart-smartx = pysmart; # added 2021-10-22
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 4a15b64da09..22f72a33d2c 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -108,10 +108,6 @@ with self; with super; {
 
   pygtk = callPackage ../development/python2-modules/pygtk { };
 
-  pyGtkGlade = self.pygtk.override {
-    inherit (pkgs.gnome2) libglade;
-  };
-
   pyjwt = callPackage ../development/python2-modules/pyjwt { };
 
   pyroma = callPackage ../development/python2-modules/pyroma { };