diff options
| author | Robin Gloster <mail@glob.in> | 2017-06-02 15:39:25 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-06-02 15:39:25 +0200 |
| commit | c1359ce04b611ec98ce7b9fd0c9db684349f86db (patch) | |
| tree | 419f3368599a4a44395441b1e6ab704525b92f4f /pkgs/desktops/gnome-3 | |
| parent | 1b55c0bc697b28510853188eccbe035f0f53e23c (diff) | |
| parent | 27aac7afcfe1bb5ac4cb2f53a0c25e3074b7aec7 (diff) | |
| download | nixpkgs-c1359ce04b611ec98ce7b9fd0c9db684349f86db.tar nixpkgs-c1359ce04b611ec98ce7b9fd0c9db684349f86db.tar.gz nixpkgs-c1359ce04b611ec98ce7b9fd0c9db684349f86db.tar.bz2 nixpkgs-c1359ce04b611ec98ce7b9fd0c9db684349f86db.tar.lz nixpkgs-c1359ce04b611ec98ce7b9fd0c9db684349f86db.tar.xz nixpkgs-c1359ce04b611ec98ce7b9fd0c9db684349f86db.tar.zst nixpkgs-c1359ce04b611ec98ce7b9fd0c9db684349f86db.zip | |
Merge remote-tracking branch 'upstream/master' into gcc-6
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.22/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix index d9b26d6aee3..b1293cb47ba 100644 --- a/pkgs/desktops/gnome-3/3.22/default.nix +++ b/pkgs/desktops/gnome-3/3.22/default.nix @@ -45,7 +45,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk214x gtk3 gtkmm3 libcanberra_gtk2 + inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2 clutter clutter-gst clutter_gtk cogl gtkvnc; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; @@ -56,7 +56,7 @@ let gtkmm = gtkmm3; vala = pkgs.vala_0_32; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; - webkitgtk = webkitgtk214x; + webkitgtk = webkitgtk216x; # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; |