From cc5663de0c17d7b76418b570a459ecb8c33dc49d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 15 Jun 2015 11:47:32 +0200
Subject: [PATCH] gnome3: easier to override packages

---
 pkgs/desktops/gnome-3/3.16/default.nix | 19 ++++++++++++++++---
 pkgs/top-level/all-packages.nix        |  5 +----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index be60a58db263..89f4ea86829b 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -1,6 +1,16 @@
-{ callPackage, pkgs, self }:
+{ pkgs }:
+
+let
+
+  pkgsFun = overrides:
+    let 
+      self = self_ // overrides;
+      self_ = with self; {
+
+  overridePackages = f: pkgsFun (f self);
+
+  callPackage = pkgs.newScope self;
 
-rec {
   corePackages = with gnome3; [
     pkgs.desktop_file_utils pkgs.ibus
     pkgs.shared_mime_info # for update-mime-database
@@ -293,4 +303,7 @@ rec {
 
   gtkhtml = callPackage ./misc/gtkhtml { };
 
-}
+    };
+  in self; # pkgsFun
+
+in pkgsFun {}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f326977b8fd..62622cd8a0da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13614,10 +13614,7 @@ let
     inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
   };
 
-  gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 {
-    callPackage = pkgs.newScope pkgs.gnome3_16;
-    self = pkgs.gnome3_16;
-  });
+  gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 { });
 
   gnome3 = gnome3_16;