alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

gnome2: use makeScope

Browse source
This commit is contained in:
Jan Tojnar 2019-03-03 22:25:43 +01:00
parent f8039e1425
commit bbe29c055d
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 21 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pkgs/desktops/gnome-2/default.nix
View file

@ -1,20 +1,19 @@
{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2, rarian { stdenv, pkgs, lib }:
, libstartup_notification, overrides ? {} }:
let overridden = set // overrides; set = with overridden; { lib.makeScope pkgs.newScope (self: with self; {
# Backward compatibility. # Backward compatibility.
gtkdoc = self.gtk-doc; gtkdoc = self.gtk-doc;
startup_notification = libstartup_notification; startup_notification = pkgs.libstartup_notification;
startupnotification = libstartup_notification; startupnotification = pkgs.libstartup_notification;
gnomedocutils = self.gnome-doc-utils; gnomedocutils = self.gnome-doc-utils;
gnomeicontheme = self.gnome_icon_theme; gnomeicontheme = self.gnome_icon_theme;
gnome_common = gnome-common; gnome_common = gnome-common;
inherit rarian; inherit (pkgs) rarian;
#### PLATFORM #### PLATFORM
libIDL = callPackage ./platform/libIDL { 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 { }; ORBit2 = callPackage ./platform/ORBit2 { };
@ -24,7 +23,7 @@ let overridden = set // overrides; set = with overridden; {
libglade = callPackage ./platform/libglade { }; libglade = callPackage ./platform/libglade { };
libgnomeprint = callPackage ./platform/libgnomeprint { libgnomeprint = callPackage ./platform/libgnomeprint {
bison = bison2; bison = pkgs.bison2;
}; };
libgnomeprintui = callPackage ./platform/libgnomeprintui { }; libgnomeprintui = callPackage ./platform/libgnomeprintui { };
@ -47,7 +46,7 @@ let overridden = set // overrides; set = with overridden; {
gnome_python = callPackage ./bindings/gnome-python { }; gnome_python = callPackage ./bindings/gnome-python { };
gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { }; 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 { }; gnome_vfs = callPackage ./platform/gnome-vfs { };
@ -64,13 +63,13 @@ let overridden = set // overrides; set = with overridden; {
gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { }; gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { };
# Required for nautilus # Required for nautilus
inherit (libunique); inherit (pkgs) libunique;
gtkglext = callPackage ./platform/gtkglext { }; gtkglext = callPackage ./platform/gtkglext { };
#### DESKTOP #### DESKTOP
gvfs = gvfs.override { gnome = self; }; gvfs = pkgs.gvfs.override { gnome = self; };
# Removed from recent GNOME releases, but still required # Removed from recent GNOME releases, but still required
scrollkeeper = callPackage ./desktop/scrollkeeper { }; scrollkeeper = callPackage ./desktop/scrollkeeper { };
@ -85,4 +84,13 @@ let overridden = set // overrides; set = with overridden; {
libglademm = callPackage ./bindings/libglademm { }; 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;
})

15
pkgs/top-level/all-packages.nix
View file

@ -21321,20 +21321,7 @@ in
callPackage = newScope pkgs.enlightenment; callPackage = newScope pkgs.enlightenment;
}); });
gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { });
callPackage = pkgs.newScope pkgs.gnome2;
self = pkgs.gnome2;
} // {
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 = res.gtk2;
gtkmm = res.gtkmm2;
});
gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { });