From 88d4e92977bbf2c29a4eff75f3b68e816fadfc3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 25 Jan 2014 17:05:33 +0100 Subject: [PATCH 01/17] add ibus --- pkgs/development/libraries/ibus/default.nix | 37 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/ibus/default.nix diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/development/libraries/ibus/default.nix new file mode 100644 index 000000000000..6200196d403d --- /dev/null +++ b/pkgs/development/libraries/ibus/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, makeWrapper, python, glib, intltool, pkgconfig +, gnome3, dbus, libnotify, isocodes, gobjectIntrospection, wayland }: + +stdenv.mkDerivation rec { + name = "ibus-${version}"; + version = "1.5.5"; + + src = fetchurl { + url = "http://ibus.googlecode.com/files/${name}.tar.gz"; + sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2"; + }; + + configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library"; + + buildInputs = [ + makeWrapper python glib wayland + intltool pkgconfig gnome3.gtk2 + gnome3.gtk3 dbus gnome3.dconf gnome3.gconf + libnotify isocodes gobjectIntrospection + ]; + + preBuild = "patchShebangs ./scripts"; + + postInstall = '' + #${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ + + for f in "$out"/bin/*; do + wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share" + done + ''; + + meta = { + homepage = https://code.google.com/p/ibus/; + description = "Intelligent Input Bus for Linux / Unix OS"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ee74ee90e1f..616716070484 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3563,6 +3563,8 @@ let hyenae = callPackage ../tools/networking/hyenae { }; + ibus = callPackage ../development/libraries/ibus { }; + iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { inherit (perlPackages) XMLSimple; }; From e505c8927d784bc3c1b1fd912dbd6020070e79d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 00:15:05 +0100 Subject: [PATCH 02/17] upower: add gobject introspection --- pkgs/os-specific/linux/upower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index cba4a510ff06..e9fa2b4adb1a 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils -, useSystemd ? true, systemd +, useSystemd ? true, systemd, gobjectIntrospection }: assert stdenv.isLinux; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ] + [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ] ++ stdenv.lib.optional useSystemd systemd; nativeBuildInputs = [ pkgconfig ]; From 344e4408359f2f5e6584a9926a458d529656ffca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 00:15:51 +0100 Subject: [PATCH 03/17] polkit: fix gobject introspection support --- pkgs/development/libraries/polkit/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 821e66ea0b30..d5d1614ec8f4 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -53,13 +53,10 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-polkitd-user=polkituser" #TODO? config.ids.uids.polkituser "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS + "--enable-introspection" ]; - makeFlags = - '' - INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 - INTROSPECTION_TYPELIBDIR=$(out)lib/girepository-1.0 - ''; + makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; #doCheck = true; # some /bin/bash problem that isn't auto-solved by patchShebangs From d8a31ba94806dd4b4c98bc24bac603be275af0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 00:16:24 +0100 Subject: [PATCH 04/17] network-manager-applet: gtk2 -> gtk3 --- .../networking/network-manager-applet/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 0c2d02a5e775..4d2dff22d114 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf -, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring +{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 +, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , makeWrapper, networkmanager_openvpn, networkmanager_vpnc , networkmanager_openconnect, udev, hicolor_icon_theme }: @@ -19,15 +19,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk libglade networkmanager libnotify libsecret dbus_glib - polkit isocodes makeWrapper udev GConf libgnome_keyring + gnome3.gtk libglade networkmanager libnotify libsecret dbus_glib + polkit isocodes makeWrapper udev gnome3.gconf gnome3.libgnome_keyring ]; nativeBuildInputs = [ intltool pkgconfig ]; - propagatedUserEnvPkgs = [ GConf gnome_keyring hicolor_icon_theme ]; - - configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK + propagatedUserEnvPkgs = [ gnome3.gconf gnome3.gnome_keyring hicolor_icon_theme ]; makeFlags = [ ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' @@ -50,7 +48,7 @@ stdenv.mkDerivation rec { --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \ --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \ - --prefix PATH ":" "${GConf}/bin" + --prefix PATH ":" "${gnome3.gconf}/bin" ''; meta = with stdenv.lib; { From fab72d88c938e77317570248fdd853828305e61c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 00:17:18 +0100 Subject: [PATCH 05/17] telepahty-logger: add gobject introspection support --- .../instant-messengers/telepathy/logger/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 527642348d25..173dfe9c929f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig -, intltool, libxslt }: +, intltool, libxslt, gobjectIntrospection, dbus_libs }: stdenv.mkDerivation rec { project = "telepathy-logger"; @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl"; }; - buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool ]; + NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; + + buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool + gobjectIntrospection dbus_libs ]; nativeBuildInputs = [ libxslt ]; From 00eaf038ac41fb12771ad7639855de8dd3776f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 00:17:49 +0100 Subject: [PATCH 06/17] gnome3.at_spi2_core: add gobject introspection support --- pkgs/desktops/gnome-3/core/at-spi2-core/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix index 2c401856b7f0..ab30c81efc23 100644 --- a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix +++ b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib -, libX11, xextproto, libSM, libICE, libXtst, libXi }: +, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation (rec { versionMajor = "2.10"; @@ -15,6 +15,7 @@ stdenv.mkDerivation (rec { buildInputs = [ python pkgconfig popt intltool dbus_glib libX11 xextproto libSM libICE libXtst libXi + gobjectIntrospection ]; # ToDo: on non-NixOS we create a symlink from there? From ec4502ff1b8df73da385ace1952270e393fa43db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 00:18:22 +0100 Subject: [PATCH 07/17] gnome3.gconf: use gtk3, not gtk2 --- pkgs/desktops/gnome-3/core/gconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix index fc7471019bdf..47dae0486e93 100644 --- a/pkgs/desktops/gnome-3/core/gconf/default.nix +++ b/pkgs/desktops/gnome-3/core/gconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, gtk, glib, libxml2 +{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3, glib, libxml2 , intltool, polkit, orbit }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; }; - buildInputs = [ libxml2 polkit gtk orbit ]; + buildInputs = [ libxml2 polkit gnome3.gtk orbit ]; propagatedBuildInputs = [ glib dbus_glib ]; nativeBuildInputs = [ pkgconfig intltool ]; From 369c6a06bf0de0992555f0b57fbe52c2c14e1750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 00:18:44 +0100 Subject: [PATCH 08/17] gcr: add gobject introspection support --- pkgs/desktops/gnome-3/core/gcr/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index 7b7588b95284..059942530ea4 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib -, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk }: +, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk +, gobjectIntrospection }: stdenv.mkDerivation rec { name = "gcr-3.10.1"; @@ -10,12 +11,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig intltool gnupg p11_kit glib + pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk ]; - configureFlags = [ "--disable-introspection" ]; - #doCheck = true; meta = with stdenv.lib; { From 7546695dbb5fefb3f2914ab315ff2e8062946c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 00:19:06 +0100 Subject: [PATCH 09/17] gdm: add gobject introspection support --- pkgs/desktops/gnome-3/core/gdm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 2955c5f399b9..3df5ab40eaf8 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountservice, libX11 -, gtk, libcanberra_gtk3, pam, libtool -}: +, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: stdenv.mkDerivation rec { name = "gdm-3.10.0.1"; src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; + url = "mirror://gnome/sources/gdm/3.10/${name}.tar.xz"; sha256 = "1rva3djas48m8w1gyv3nds3jxfkirdfl0bk30x79mizrk80456jl"; }; - buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice libX11 gtk libcanberra_gtk3 pam libtool ]; + buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice + gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ]; meta = with stdenv.lib; { platforms = platforms.linux; From 3c6d52c3daaa09737dd82a842ca557065e168885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 00:19:23 +0100 Subject: [PATCH 10/17] gjs: add pango support --- pkgs/desktops/gnome-3/core/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index e4a0752eb4ae..429d147e728b 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17 }: +{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17, pango }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = with gnome3; - [ gobjectIntrospection pkgconfig glib ]; + [ gobjectIntrospection pkgconfig glib pango ]; propagatedBuildInputs = [ spidermonkey_17 ]; From 12f8e301386d1e2fd7af35c0d37fb1f3884d5505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 00:19:49 +0100 Subject: [PATCH 11/17] gnome-keyring: use gtk3 --- pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 14f0110e374d..455f18de98e0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt -, gtk3, intltool, gconf, libgnome_keyring, pango, gcr, gdk_pixbuf, atk, p11_kit -, docbook_xsl_ns, docbook_xsl }: +, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit +, docbook_xsl_ns, docbook_xsl, gnome3 }: stdenv.mkDerivation rec { name = "gnome-keyring-3.10.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1y6v2p14jx5h6yh14c53pd8r0r5zbmcgw8v4nxvf94kd9jliy00q"; }; - buildInputs = [ + buildInputs = with gnome3; [ dbus libgcrypt pam python gtk3 gconf libgnome_keyring pango gcr gdk_pixbuf atk p11_kit ]; From 832f050679142add3688634318ca6c895f19c212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 00:20:22 +0100 Subject: [PATCH 12/17] gnome3: fix some packages to use mirror url --- pkgs/desktops/gnome-3/core/gnome-menus/default.nix | 13 ++++++------- .../gnome-3/core/gnome-online-accounts/default.nix | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix index 0103800b02f2..37d2ea1c0863 100644 --- a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }: -let - version = "3.10.1"; -in -stdenv.mkDerivation { - name = "gnome-menus-${version}"; - src = fetchurl { - url = "http://ftp.gnome.org/pub/gnome/sources/gnome-menus/3.10/gnome-menus-3.10.1.tar.xz"; +stdenv.mkDerivation rec { + name = "gnome-menus-${version}"; + version = "3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz"; sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index 3040d817a16f..c17b3ba3eb6c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -6,7 +6,7 @@ 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"; + url = "mirror://gnome/sources/gnome-online-accounts/3.10/${name}.tar.xz"; sha256 = "15qvw40dmi886491s3abpidsm2lx65fhglhj99bvcdskhk0ih90b"; }; From 8b3c8926eb064613019f51df623ac248be8b5da7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 00:20:49 +0100 Subject: [PATCH 13/17] gnome3.gnome_session: use systemd --- pkgs/desktops/gnome-3/core/gnome-session/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 404269861829..804a0c54a41b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower -, libxslt, intltool, makeWrapper }: +, libxslt, intltool, makeWrapper, systemd }: stdenv.mkDerivation rec { @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { sha256 = "1k59yss7r748nvr0cdjrqmx0zy26b93rfn66lsdg9fz60x77087n"; }; + configureFlags = "--enable-systemd"; + buildInputs = with gnome3; [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gsettings_desktop_schemas upower intltool gconf makeWrapper ]; - - # TODO: dbus, gnome-shell, gnome-settings-daemon + gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; postInstall = '' wrapProgram "$out/bin/gnome-session" \ From 96777994c88cd422dd773029eb4c5db9d59f60ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 00:21:19 +0100 Subject: [PATCH 14/17] gnome3.gnome_settings_daemon: depend on ibus --- .../gnome-3/core/gnome-settings-daemon/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index cce0ff46ca0b..cb9b00f5279f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst , libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit , geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool -, docbook_xsl, docbook_xsl_ns, makeWrapper }: +, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus }: stdenv.mkDerivation rec { name = "gnome-settings-daemon-3.10.2"; @@ -11,13 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0r42lzlgk0w40ws4d3s7yayn6n8zqlnh5b6k88gvgv1lwk39k240"; }; - configureFlags = "--disable-ibus"; - # fatal error: gio/gunixfdlist.h: No such file or directory NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; buildInputs = with gnome3; - [ intltool pkgconfig gtk glib gsettings_desktop_schemas libnotify gnome_desktop + [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio libcanberra_gtk3 upower colord libgweather polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt libtool docbook_xsl docbook_xsl_ns makeWrapper ]; @@ -25,6 +23,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix PATH : "${glib}/bin" \ --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share" ''; From 553963eb0c2bfa394b46061cb812317523712ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 00:21:43 +0100 Subject: [PATCH 15/17] gnome3: always use libcanberra_gtk3 --- pkgs/desktops/gnome-3/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 59097b6aeef5..b3914659231c 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -3,6 +3,7 @@ rec { inherit (pkgs) glib gtk2 gtk3 gnome2; gtk = gtk3; # just to be sure + libcanberra = pkgs.libcanberra_gtk3; # just to be sure inherit (pkgs.gnome2) gnome_common ORBit2; orbit = ORBit2; From b4d7bafb8f0e3b84686366060bcb824a48fd8b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 00:22:04 +0100 Subject: [PATCH 16/17] ibus: cleanup --- pkgs/development/libraries/ibus/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/development/libraries/ibus/default.nix index 6200196d403d..6c82ad839e13 100644 --- a/pkgs/development/libraries/ibus/default.nix +++ b/pkgs/development/libraries/ibus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python, glib, intltool, pkgconfig +{ stdenv, fetchurl, makeWrapper, python, intltool, pkgconfig , gnome3, dbus, libnotify, isocodes, gobjectIntrospection, wayland }: stdenv.mkDerivation rec { @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2"; }; - configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library"; + configureFlags = "--enable-dconf --disable-memconf --enable-ui --enable-python-library"; buildInputs = [ - makeWrapper python glib wayland + makeWrapper python gnome3.glib wayland intltool pkgconfig gnome3.gtk2 gnome3.gtk3 dbus gnome3.dconf gnome3.gconf libnotify isocodes gobjectIntrospection @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { preBuild = "patchShebangs ./scripts"; postInstall = '' - #${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ - for f in "$out"/bin/*; do wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share" done From f1f0b3a205c07a2dbdbf8ba579a155855de19b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Jan 2014 09:55:52 +0100 Subject: [PATCH 17/17] Add gnome3.gnome_shell --- .../gnome-3/core/gnome-shell/default.nix | 43 +++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/gnome-shell/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix new file mode 100644 index 000000000000..3799a008c1b3 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -0,0 +1,43 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret +, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns +, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit +, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper +, accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }: + + +stdenv.mkDerivation rec { + name = "gnome-shell-3.10.2.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-shell/3.10/${name}.tar.xz"; + sha256 = "0k642y6h878v6mczx4z1zj4pjl7z4bvq02raxxwxkjyvyz2fv36j"; + }; + + buildInputs = with gnome3; + [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountservice + libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf + clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns + libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server + libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm + at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger ]; + + configureFlags = "--disable-static"; + + preBuild = '' + patchShebangs src/data-to-c.pl + ''; + + postInstall = with gnome3; '' + wrapProgram "$out/bin/gnome-shell" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \ + --prefix XDG_DATA_DIRS : "${gnome-menus}:/share:${ibus}/share:${gnome_settings_daemon}/share:${gdm}/share:${glib}/share:${gnome_themes_standard}/share:${mutter}/share:${gnome_icon_theme}/share:${gsettings_desktop_schemas}/share:${gtk}/share:$out/share" + wrapProgram "$out/libexec/gnome-shell-calendar-server" \ + --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index b3914659231c..772aaf54e0a0 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -48,6 +48,8 @@ rec { gnome_session = callPackage ./core/gnome-session { }; + gnome_shell = callPackage ./core/gnome-shell { }; + gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; gnome_terminal = callPackage ./core/gnome-terminal { };