From c83dfedaa26d57b7c5e5a22d0375d9b8d00d0fbe Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Sat, 18 Feb 2017 12:24:18 +0100
Subject: [PATCH] gnome3.gnome-tweak-tool: Don't propagate python dependency
 (#21851)

---
 .../3.22/misc/gnome-tweak-tool/default.nix     | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
index f75cdd0e83e2..5a1baa5e3307 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
@@ -4,7 +4,7 @@
 , gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
 
 let
-  python = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
+  pythonEnv = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
 in stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
@@ -12,15 +12,6 @@ in stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  # Make sure that Python 2 is first in $PATH because gnome3.gnome_shell
-  # propagates python3Packages.python.  If we do not do this, autoconf will use
-  # Python 3 instead which gnome-tweak-tool does not support at this time.  See:
-  # https://github.com/NixOS/nixpkgs/issues/21851
-  # https://github.com/NixOS/nixpkgs/pull/22370
-  preConfigure = ''
-    PATH="${python}/bin:$PATH"
-  '';
-
   makeFlags = [ "DESTDIR=/" ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
@@ -28,11 +19,10 @@ in stdenv.mkDerivation rec {
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
                   libnotify gnome3.gnome_shell
                   libsoup gnome3.gnome_settings_daemon gnome3.nautilus
-                  gnome3.gnome_desktop wrapGAppsHook ];
+                  gnome3.gnome_desktop wrapGAppsHook
+                  python2Packages.pygobject3.dev pythonEnv gobjectIntrospection ];
 
-  propagatedBuildInputs = [ python gobjectIntrospection ];
-
-  PYTHONPATH = "$out/${python.python.sitePackages}";
+  PYTHONPATH = "$out/${pythonEnv.python.sitePackages}";
 
   wrapPrefixVariables = [ "PYTHONPATH" ];