diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-03-03 22:25:43 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-03-05 15:27:24 +0100 |
commit | bbe29c055de61e6ce274192eeee4e570dfd49889 (patch) | |
tree | 96520fcd634dd47985f6dda6d13944a596553efb /pkgs/desktops/gnome-2 | |
parent | f8039e1425985d81fe4f6f6e3f55727bf3f4513a (diff) |
gnome2: use makeScope
Diffstat (limited to 'pkgs/desktops/gnome-2')
-rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index f67dc13c8545..db20e8357454 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -1,20 +1,19 @@ -{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2, rarian -, libstartup_notification, overrides ? {} }: +{ stdenv, pkgs, lib }: -let overridden = set // overrides; set = with overridden; { +lib.makeScope pkgs.newScope (self: with self; { # Backward compatibility. gtkdoc = self.gtk-doc; - startup_notification = libstartup_notification; - startupnotification = libstartup_notification; + startup_notification = pkgs.libstartup_notification; + startupnotification = pkgs.libstartup_notification; gnomedocutils = self.gnome-doc-utils; gnomeicontheme = self.gnome_icon_theme; gnome_common = gnome-common; - inherit rarian; + inherit (pkgs) rarian; #### PLATFORM libIDL = callPackage ./platform/libIDL { - gettext = if stdenv.isDarwin then gettext else null; + gettext = if stdenv.isDarwin then pkgs.gettext else null; }; ORBit2 = callPackage ./platform/ORBit2 { }; @@ -24,7 +23,7 @@ let overridden = set // overrides; set = with overridden; { libglade = callPackage ./platform/libglade { }; libgnomeprint = callPackage ./platform/libgnomeprint { - bison = bison2; + bison = pkgs.bison2; }; libgnomeprintui = callPackage ./platform/libgnomeprintui { }; @@ -47,7 +46,7 @@ let overridden = set // overrides; set = with overridden; { gnome_python = callPackage ./bindings/gnome-python { }; gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { }; - python_rsvg = overridden.gnome_python_desktop; + python_rsvg = self.gnome_python_desktop; gnome_vfs = callPackage ./platform/gnome-vfs { }; @@ -64,13 +63,13 @@ let overridden = set // overrides; set = with overridden; { gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { }; # Required for nautilus - inherit (libunique); + inherit (pkgs) libunique; gtkglext = callPackage ./platform/gtkglext { }; #### DESKTOP - gvfs = gvfs.override { gnome = self; }; + gvfs = pkgs.gvfs.override { gnome = self; }; # Removed from recent GNOME releases, but still required scrollkeeper = callPackage ./desktop/scrollkeeper { }; @@ -85,4 +84,13 @@ let overridden = set // overrides; set = with overridden; { libglademm = callPackage ./bindings/libglademm { }; -}; in overridden + inherit (pkgs) + # GTK Libs + glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2 + + # Included for backwards compatibility + libsoup libwnck gtk-doc gnome-doc-utils; + + gtk = pkgs.gtk2; + gtkmm = pkgs.gtkmm2; +}) |