From 57d384459ef1d76c0a8ae5ac7fa1b889410286dc Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" <urkud.urkud@gmail.com> Date: Sun, 9 Oct 2011 17:23:54 +0000 Subject: [PATCH] Add gnome3. Do not recurse into attrs svn path=/nixpkgs/trunk/; revision=29732 --- pkgs/desktops/gnome-3/TODO.txt | 113 +++++++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 8 ++ pkgs/desktops/gnome-3/platform/GConf.nix | 16 ++++ pkgs/top-level/all-packages.nix | 4 + 4 files changed, 141 insertions(+) create mode 100644 pkgs/desktops/gnome-3/TODO.txt create mode 100644 pkgs/desktops/gnome-3/default.nix create mode 100644 pkgs/desktops/gnome-3/platform/GConf.nix diff --git a/pkgs/desktops/gnome-3/TODO.txt b/pkgs/desktops/gnome-3/TODO.txt new file mode 100644 index 000000000000..d3a04425cfb2 --- /dev/null +++ b/pkgs/desktops/gnome-3/TODO.txt @@ -0,0 +1,113 @@ +## CORE +core:NetworkManager:0.9.1.90: +core:atk:2.2.0: +core:atkmm:2.22.5: +core:brasero:3.2.0: +core:cantarell-fonts:0.0.6: +core:caribou:0.4.0: +core:clutter:1.8.0: +core:clutter-gtk:1.0.4: +core:cogl:1.8.0: +core:dconf:0.10.0: +core:empathy:3.2.0: +core:eog:3.2.0: +core:epiphany:3.2.0: +core:evince:3.2.0: +core:evolution-data-server:3.2.0: +core:folks:0.6.3.2: +core:gcalctool:6.2.0: +core:gdk-pixbuf:2.24.0: +core:gdm:3.2.0: +core:gjs:1.30.0: +core:glib:2.30.0: +core:glib-networking:2.30.0: +core:glibmm:2.30.0: +core:gnome-backgrounds:3.2.0: +core:gnome-bluetooth:3.2.0: +core:gnome-contacts:3.2.0.1: +core:gnome-control-center:3.2.0: +core:gnome-desktop:3.2.0: +core:gnome-disk-utility:3.0.2: +core:gnome-doc-utils:0.20.6: +core:gnome-icon-theme:3.2.0: +core:gnome-icon-theme-extras:3.0.0: +core:gnome-icon-theme-symbolic:3.2.0: +core:gnome-keyring:3.2.0: +core:gnome-menus:3.2.0: +core:gnome-online-accounts:3.2.0.1: +core:gnome-packagekit:3.2.0: +core:gnome-panel:3.2.0: +core:gnome-power-manager:3.2.0: +core:gnome-screensaver:3.2.0: +core:gnome-session:3.2.0: +core:gnome-settings-daemon:3.2.0: +core:gnome-shell:3.2.0: +core:gnome-system-monitor:3.2.0: +core:gnome-terminal:3.2.0: +core:gnome-themes-standard:3.2.0.2: +core:gnome-user-docs:3.2.0.1: +core:gnome-user-share:3.0.0: +core:gnome-utils:3.2.0: +core:gnome-video-effects:0.3.0: +core:gobject-introspection:1.30.0: +core:gsettings-desktop-schemas:3.2.0: +core:gst-plugins-base:0.10.35: +core:gst-plugins-good:0.10.30: +core:gstreamer:0.10.35: +core:gtk+:3.2.0: +core:gtk+:2.24.6: +core:gtk-doc:1.18: +core:gtkmm:3.2.0: +core:gucharmap:3.2.0: +core:gvfs:1.10.0: +core:libgnome-keyring:3.2.0: +core:libgnomekbd:3.2.0: +core:libgtop:2.28.4: +core:libgweather:3.2.0: +core:libpeas:1.2.0: +core:librsvg:2.34.1: +core:libsoup:2.36.0: +core:libwnck:3.2.0: +core:metacity:2.34.1: +core:mm-common:0.9.5: +core:mousetweaks:3.2.0: +core:mutter:3.2.0: +core:nautilus:3.2.0: +core:network-manager-applet:0.9.1.90: +core:notification-daemon:0.7.2: +core:pango:1.29.4: +core:pangomm:2.28.3: +core:polkit-gnome:0.103: +core:sushi:0.2.0: +core:totem-pl-parser:2.32.6: +core:vino:3.2.0: +core:vte:0.30.0: +core:yelp:3.2.0: +core:yelp-tools:3.2.0: +core:yelp-xsl:3.2.0: +core:zenity:3.2.0: + +## APPS +apps:accerciser:3.2.0: +apps:aisleriot:3.2.0: +apps:anjuta:3.2.0: +apps:cheese:3.2.0: +apps:devhelp:3.2.0: +apps:evolution:3.2.0: +apps:file-roller:3.2.0: +apps:gedit:3.2.0: +apps:glade:3.10.0: +apps:gnome-color-manager:3.2.0: +apps:gnome-devel-docs:3.2.0: +apps:gnome-documents:0.2.0: +apps:gnome-games:3.2.0: +apps:gnome-nettool:3.0.0: +apps:hamster-applet:2.91.2: +apps:nautilus-sendto:3.0.1: +apps:nemiver:0.9.0: +apps:orca:3.2.0: +apps:rygel:0.12.3: +apps:seahorse:3.2.0: +apps:totem:3.2.0: +apps:vinagre:3.2.0: + diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix new file mode 100644 index 000000000000..b82ca22d94fa --- /dev/null +++ b/pkgs/desktops/gnome-3/default.nix @@ -0,0 +1,8 @@ +{ callPackage }: + +{ + # Ensure that we use dbus-glib built with gtkLibs3x.glib + dbus_glib = callPackage ../../development/libraries/dbus-glib { }; + + GConf = callPackage ./platform/GConf.nix { }; +} diff --git a/pkgs/desktops/gnome-3/platform/GConf.nix b/pkgs/desktops/gnome-3/platform/GConf.nix new file mode 100644 index 000000000000..824aa8843a7e --- /dev/null +++ b/pkgs/desktops/gnome-3/platform/GConf.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl_gnome, glib, dbus_glib, pkgconfig, xz, libxml2, gtk, intltool }: + +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "GConf"; + major = "3"; minor = "2"; patchlevel = "0"; extension = "xz"; + sha256 = "02vdm6slc2mdw0yfl6lh7qawqcb2k7sk6br21fdj1vfp55ap8wgk"; + }; + + propagatedBuildInputs = [ glib dbus_glib libxml2 gtk ]; + buildNativeInputs = [ pkgconfig xz intltool ]; + + configureFlags = "--disable-orbit"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7512a9f25ede..152215ecebe6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7863,6 +7863,10 @@ let self = pkgs.gnome2; } // pkgs.gtkLibs); + gnome3 = (import ../desktops/gnome-3 { + callPackage = pkgs.newScope pkgs.gnome3; + } // pkgs.gtkLibs3x); + gnome = recurseIntoAttrs gnome2; kde3 = recurseIntoAttrs {