From 8f8d308fe1788a482a1ac62e22e20ced09df526b Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 31 Aug 2017 13:25:16 -0300
Subject: [PATCH] mate: use newScope

---
 pkgs/desktops/mate/default.nix  | 109 +++++++++++++++++---------------
 pkgs/top-level/all-packages.nix |   4 +-
 2 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 5657f3093626..3cac721c0eb3 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -1,57 +1,62 @@
-{ callPackage, pkgs }:
+{ pkgs, newScope }:
 
-rec {
+let
+  callPackage = newScope self;
 
-  atril = callPackage ./atril { };
-  caja = callPackage ./caja { };
-  caja-extensions = callPackage ./caja-extensions { };
-  cajaWithExtensions = callPackage ./caja/cajaWithExtensions.nix {
-    extensions = [ caja-extensions ];
-  };
-  engrampa = callPackage ./engrampa { };
-  eom = callPackage ./eom { };
-  libmatekbd = callPackage ./libmatekbd { };
-  libmatemixer = callPackage ./libmatemixer { };
-  libmateweather = callPackage ./libmateweather { };
-  marco = callPackage ./marco { };
-  mate-common = callPackage ./mate-common { };
-  mate-control-center = callPackage ./mate-control-center { };
-  mate-desktop = callPackage ./mate-desktop { };
-  mate-icon-theme = callPackage ./mate-icon-theme { };
-  mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
-  mate-menus = callPackage ./mate-menus { };
-  mate-panel = callPackage ./mate-panel { };
-  mate-session-manager = callPackage ./mate-session-manager { };
-  mate-settings-daemon = callPackage ./mate-settings-daemon { };
-  mate-terminal = callPackage ./mate-terminal { };
-  mate-themes = callPackage ./mate-themes { };
-  pluma = callPackage ./pluma { };
+  self = rec {
 
-  basePackages = [
-    caja
-    libmatekbd
-    libmatemixer
-    libmateweather
-    marco
-    mate-common
-    mate-control-center
-    mate-desktop
-    mate-icon-theme
-    mate-menus
-    mate-panel
-    mate-session-manager
-    mate-settings-daemon
-    mate-themes
-  ];
+    atril = callPackage ./atril { };
+    caja = callPackage ./caja { };
+    caja-extensions = callPackage ./caja-extensions { };
+    cajaWithExtensions = callPackage ./caja/cajaWithExtensions.nix {
+      extensions = [ caja-extensions ];
+    };
+    engrampa = callPackage ./engrampa { };
+    eom = callPackage ./eom { };
+    libmatekbd = callPackage ./libmatekbd { };
+    libmatemixer = callPackage ./libmatemixer { };
+    libmateweather = callPackage ./libmateweather { };
+    marco = callPackage ./marco { };
+    mate-common = callPackage ./mate-common { };
+    mate-control-center = callPackage ./mate-control-center { };
+    mate-desktop = callPackage ./mate-desktop { };
+    mate-icon-theme = callPackage ./mate-icon-theme { };
+    mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
+    mate-menus = callPackage ./mate-menus { };
+    mate-panel = callPackage ./mate-panel { };
+    mate-session-manager = callPackage ./mate-session-manager { };
+    mate-settings-daemon = callPackage ./mate-settings-daemon { };
+    mate-terminal = callPackage ./mate-terminal { };
+    mate-themes = callPackage ./mate-themes { };
+    pluma = callPackage ./pluma { };
 
-  extraPackages = [
-    atril
-    cajaWithExtensions
-    engrampa
-    eom
-    mate-icon-theme-faenza
-    mate-terminal
-    pluma
-  ];
+    basePackages = [
+      caja
+      libmatekbd
+      libmatemixer
+      libmateweather
+      marco
+      mate-common
+      mate-control-center
+      mate-desktop
+      mate-icon-theme
+      mate-menus
+      mate-panel
+      mate-session-manager
+      mate-settings-daemon
+      mate-themes
+    ];
+
+    extraPackages = [
+      atril
+      cajaWithExtensions
+      engrampa
+      eom
+      mate-icon-theme-faenza
+      mate-terminal
+      pluma
+    ];
   
-}
+  };
+
+in self
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d4ce349878b..680b6cd3dc46 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17821,9 +17821,7 @@ with pkgs;
     inherit (lib) makeScope;
   });
 
-  mate = recurseIntoAttrs (callPackage ../desktops/mate {
-    callPackage = newScope pkgs.mate;
-  });
+  mate = recurseIntoAttrs (callPackage ../desktops/mate { });
 
   maxx = callPackage ../desktops/maxx { };