diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2014-01-11 14:14:39 +0100 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2014-01-11 14:14:39 +0100 |
| commit | 59626be3de03132d04fd4ed0a8e3bb105a10cd33 (patch) | |
| tree | 303f700adde52d1341720b3af7e0fe7bc25be727 /pkgs/desktops | |
| parent | 3a8aa938218d7aac650b4bcca69b958f58e4407a (diff) | |
| download | nixpkgs-59626be3de03132d04fd4ed0a8e3bb105a10cd33.tar nixpkgs-59626be3de03132d04fd4ed0a8e3bb105a10cd33.tar.gz nixpkgs-59626be3de03132d04fd4ed0a8e3bb105a10cd33.tar.bz2 nixpkgs-59626be3de03132d04fd4ed0a8e3bb105a10cd33.tar.lz nixpkgs-59626be3de03132d04fd4ed0a8e3bb105a10cd33.tar.xz nixpkgs-59626be3de03132d04fd4ed0a8e3bb105a10cd33.tar.zst nixpkgs-59626be3de03132d04fd4ed0a8e3bb105a10cd33.zip | |
Gnome3: add gnome-online-accounts.
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 8 |
2 files changed, 26 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix new file mode 100644 index 00000000000..3040d817a16 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, webkitgtk, json_glib, rest, libsecret, dbus_glib +, telepathy_glib, intltool, dbus_libs, icu, libsoup, docbook_xsl_ns, docbook_xsl +}: + +stdenv.mkDerivation rec { + name = "gnome-online-accounts-3.10.2"; + + src = fetchurl { + url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; + sha256 = "15qvw40dmi886491s3abpidsm2lx65fhglhj99bvcdskhk0ih90b"; + }; + + NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; + + buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib intltool icu libsoup docbook_xsl_ns docbook_xsl]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 10e85dc8998..df1ddf45bfc 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -10,7 +10,7 @@ rec { #### Overrides of libraries librsvg = pkgs.librsvg.override { inherit gtk2; }; # gtk2 mysteriously needed in librsvg for goffice (commented in Gentoo) - + libsoup = pkgs.libsoup_2_44; #### Core (http://ftp.acc.umu.se/pub/GNOME/core/) @@ -33,6 +33,8 @@ rec { gnome_keyring = callPackage ./core/gnome-keyring { }; libgnome_keyring = callPackage ./core/libgnome-keyring { }; + gnome_online_accounts = callPackage ./core/gnome-online-accounts { }; + gnome_terminal = callPackage ./core/gnome-terminal { }; gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; @@ -53,10 +55,12 @@ rec { libqmi = callPackage ./core/libqmi {}; - libgweather = callPackage ./core/libgweather { libsoup = pkgs.libsoup_2_44; }; + libgweather = callPackage ./core/libgweather { }; nautilus = callPackage ./core/nautilus { }; + rest = callPackage ./core/rest { }; + vte = callPackage ./core/vte { }; zenity = callPackage ./core/zenity { }; |