public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #83403 from jtojnar/gnome-fixes

Browse Source 
GNOME fixes
This commit is contained in:
Jan Tojnar 2020-03-27 21:51:35 +01:00 committed by GitHub
commit 10c984c7d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
View File

@ -32,7 +32,6 @@
, tzdata , tzdata
, yelp , yelp
, libgnomekbd , libgnomekbd
, malcontent
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -75,7 +74,6 @@ stdenv.mkDerivation rec {
polkit polkit
webkitgtk webkitgtk
libnma libnma
malcontent
]; ];
patches = [ patches = [
@ -89,6 +87,7 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dcheese=disabled" "-Dcheese=disabled"
"-Dibus=disabled" "-Dibus=disabled"
"-Dparental_controls=disabled"
"-Dvendor-conf-file=${./vendor.conf}" "-Dvendor-conf-file=${./vendor.conf}"
]; ];

8
pkgs/desktops/gnome-3/core/gnome-shell/default.nix
View File

@ -43,6 +43,7 @@ in stdenv.mkDerivation rec {
# recording # recording
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-good
# not declared at build time, but typelib is needed at runtime # 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"; url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/72c4f148ef88b4bffb2106b99434da5c05c0bb64.patch";
sha256 = "RBA+JHz4ZvmbJZMnGNieD6D5LONRgFU4iOFIMQQ2kHQ="; 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 = '' postPatch = ''