about summary refs log tree commit diff
path: root/pkgs/desktops/gnome-2/default.nix
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2013-12-30 11:04:45 -0500
committerShea Levy <shea@shealevy.com>2013-12-30 11:04:45 -0500
commit4af1c79c06bf5b67c5c6f0c395910a3b6dd36fcf (patch)
tree22eb1187256a80a1d0468fbf23eefede2ab1f4c6 /pkgs/desktops/gnome-2/default.nix
parentf529e915012ed515ddbd10b4fd6c24eda7647a73 (diff)
Remove uses of __overrides feature
In addition to replacing use of a feature with IMO confusing semantics,
this will also let us cleanly separate out all-packages.nix into
category-specific files without changing the structure of the pkgs
attrset.

Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs/desktops/gnome-2/default.nix')
-rw-r--r--pkgs/desktops/gnome-2/default.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index cecd56ad4f27a..c2e1c062e9e39 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -1,7 +1,5 @@
 { callPackage, self, stdenv, gettext, gvfs, libunique, overrides ? {} }:
-{
-  __overrides = overrides;
-
+let overridden = set // overrides; set = with overridden; {
   # Backward compatibility.
   gtkdoc = self.gtk_doc;
   startupnotification = self.startup_notification;
@@ -117,4 +115,4 @@
 
   libglademm = callPackage ./bindings/libglademm { };
 
-}
+}; in overridden