diff options
| author | Luca Bruno <lucabru@src.gnome.org> | 2016-10-23 14:11:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-23 14:11:41 +0100 |
| commit | 062416d4c1a2acfc1d6054c8ae4abe9da7befbc3 (patch) | |
| tree | 98df1b9351af6d9d03aa3f1fdb216b752eb646a8 /pkgs/desktops | |
| parent | ea50c1255a5532359fa5de2f220f1600966f7805 (diff) | |
| parent | 7902a5de5977747563b1766a0d0d1d8a6ab53fe4 (diff) | |
| download | nixlib-062416d4c1a2acfc1d6054c8ae4abe9da7befbc3.tar nixlib-062416d4c1a2acfc1d6054c8ae4abe9da7befbc3.tar.gz nixlib-062416d4c1a2acfc1d6054c8ae4abe9da7befbc3.tar.bz2 nixlib-062416d4c1a2acfc1d6054c8ae4abe9da7befbc3.tar.lz nixlib-062416d4c1a2acfc1d6054c8ae4abe9da7befbc3.tar.xz nixlib-062416d4c1a2acfc1d6054c8ae4abe9da7befbc3.tar.zst nixlib-062416d4c1a2acfc1d6054c8ae4abe9da7befbc3.zip | |
Merge pull request #19744 from groxxda/gnome-fwdport
gnome3.22: forward port intermediate changes to 3.20
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.22/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix index e38d075befcf..9d36648d5cdc 100644 --- a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { webkitgtk libsoup libsecret gnome_desktop libnotify libtool sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common - gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf ]; + gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf + gnome3.glib_networking ]; NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix index 3ebd964ab0ec..3b76ac80fdb0 100644 --- a/pkgs/desktops/gnome-3/3.22/default.nix +++ b/pkgs/desktops/gnome-3/3.22/default.nix @@ -264,9 +264,7 @@ let glade = callPackage ./apps/glade { }; - gnome-boxes = callPackage ./apps/gnome-boxes { - spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; }; - }; + gnome-boxes = callPackage ./apps/gnome-boxes { }; gnome-calendar = callPackage ./apps/gnome-calendar { }; diff --git a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix index af74df4ad13b..3cb62fef6c2f 100644 --- a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix @@ -7,7 +7,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper ]; + gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper + gnome3.gsettings_desktop_schemas + ]; preFixup = '' wrapProgram $out/bin/anjuta \ |