git.iko.soy/typeable/nixpkgs
on master help sign in
gnome2: use makeScope
commitbbe29c055de61e6ce274192eeee4e570dfd49889 authorJan Tojnar <jtojnar@gmail.com> dateSun 3 Mar 2019, 22:25 (8 years ago) parentf8039e1
2 files changed+21−26
pkgs/desktops/gnome-2/default.nix+20−12 pkgs/top-level/all-packages.nix+1−14
pkgs/desktops/gnome-2/default.nix+20−12
@@ -1,20 +1,19 @@
1−{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2, rarian
2−, libstartup_notification, overrides ? {} }:
1+{ stdenv, pkgs, lib }:
32
4−let overridden = set // overrides; set = with overridden; {
3+lib.makeScope pkgs.newScope (self: with self; {
54 # Backward compatibility.
65 gtkdoc = self.gtk-doc;
7− startup_notification = libstartup_notification;
8− startupnotification = libstartup_notification;
6+ startup_notification = pkgs.libstartup_notification;
7+ startupnotification = pkgs.libstartup_notification;
98 gnomedocutils = self.gnome-doc-utils;
109 gnomeicontheme = self.gnome_icon_theme;
1110 gnome_common = gnome-common;
12− inherit rarian;
11+ inherit (pkgs) rarian;
1312
1413#### PLATFORM
1514
1615 libIDL = callPackage ./platform/libIDL {
17− gettext = if stdenv.isDarwin then gettext else null;
16+ gettext = if stdenv.isDarwin then pkgs.gettext else null;
1817 };
1918
2019 ORBit2 = callPackage ./platform/ORBit2 { };
@@ -24,7 +23,7 @@ let overridden = set // overrides; set = with overridden; {
2423 libglade = callPackage ./platform/libglade { };
2524
2625 libgnomeprint = callPackage ./platform/libgnomeprint {
27− bison = bison2;
26+ bison = pkgs.bison2;
2827 };
2928
3029 libgnomeprintui = callPackage ./platform/libgnomeprintui { };
@@ -47,7 +46,7 @@ let overridden = set // overrides; set = with overridden; {
4746 gnome_python = callPackage ./bindings/gnome-python { };
4847
4948 gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { };
50− python_rsvg = overridden.gnome_python_desktop;
49+ python_rsvg = self.gnome_python_desktop;
5150
5251 gnome_vfs = callPackage ./platform/gnome-vfs { };
5352
@@ -64,13 +63,13 @@ let overridden = set // overrides; set = with overridden; {
6463 gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { };
6564
6665 # Required for nautilus
67− inherit (libunique);
66+ inherit (pkgs) libunique;
6867
6968 gtkglext = callPackage ./platform/gtkglext { };
7069
7170#### DESKTOP
7271
73− gvfs = gvfs.override { gnome = self; };
72+ gvfs = pkgs.gvfs.override { gnome = self; };
7473
7574 # Removed from recent GNOME releases, but still required
7675 scrollkeeper = callPackage ./desktop/scrollkeeper { };
@@ -85,4 +84,13 @@ let overridden = set // overrides; set = with overridden; {
8584
8685 libglademm = callPackage ./bindings/libglademm { };
8786
88−}; in overridden
87+ inherit (pkgs)
88+ # GTK Libs
89+ glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
90+
91+ # Included for backwards compatibility
92+ libsoup libwnck gtk-doc gnome-doc-utils;
93+
94+ gtk = pkgs.gtk2;
95+ gtkmm = pkgs.gtkmm2;
96+})
pkgs/top-level/all-packages.nix+1−14
@@ -21321,20 +21321,7 @@ in
2132121321 callPackage = newScope pkgs.enlightenment;
2132221322 });
2132321323
21324− gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 {
21325− callPackage = pkgs.newScope pkgs.gnome2;
21326− self = pkgs.gnome2;
21327− } // {
21328− inherit (pkgs)
21329− # GTK Libs
21330− glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
21331−
21332− # Included for backwards compatibility
21333− libsoup libwnck gtk-doc gnome-doc-utils;
21334−
21335− gtk = res.gtk2;
21336− gtkmm = res.gtkmm2;
21337− });
21324+ gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { });
2133821325
2133921326 gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { });
2134021327