diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index b19acb0b912..521845a8a8a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -32,7 +32,6 @@ , tzdata , yelp , libgnomekbd -, malcontent }: stdenv.mkDerivation rec { @@ -75,7 +74,6 @@ stdenv.mkDerivation rec { polkit webkitgtk libnma - malcontent ]; patches = [ @@ -89,6 +87,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dcheese=disabled" "-Dibus=disabled" + "-Dparental_controls=disabled" "-Dvendor-conf-file=${./vendor.conf}" ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 37a7d257847..d099e582839 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -43,6 +43,7 @@ in stdenv.mkDerivation rec { # recording gst_all_1.gstreamer + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good # not declared at build time, but typelib is needed at runtime @@ -85,6 +86,13 @@ in stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/72c4f148ef88b4bffb2106b99434da5c05c0bb64.patch"; sha256 = "RBA+JHz4ZvmbJZMnGNieD6D5LONRgFU4iOFIMQQ2kHQ="; }) + + # Fix Telepathy chat integration. + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2449 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/766288eec1bd3bd50dfc4ddf410c2b507187e603.patch"; + sha256 = "Cp6xLohCM0gmMxtyYjSukS2oV60Khmxf4iQd9EDAlIc="; + }) ]; postPatch = ''