diff options
author | Bobby Rong <rjl931189261@126.com> | 2023-03-10 07:37:18 +0000 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2023-04-06 01:35:15 +0200 |
commit | 0c35dfccb99cb0592e2a93c7d7007aa831924910 (patch) | |
tree | 138c7897a8440df3ea37944a95bfd5739a75a584 /pkgs/desktops/gnome/core/gnome-shell | |
parent | 96439cfed09d07580cd38786ccb97fe817885c53 (diff) |
gnome.gnome-shell: 44.beta → 44.rc
https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/44.beta...44.rc Since we disabled tests in mutter, we need to do it here as well to avoid: ERROR: Dependency "libmutter-test-12" not found, tried pkgconfig Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
Diffstat (limited to 'pkgs/desktops/gnome/core/gnome-shell')
-rw-r--r-- | pkgs/desktops/gnome/core/gnome-shell/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index dd7b00b0414df..a4addfd14a316 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -36,7 +36,7 @@ , gdm , upower , ibus -, libnma +, libnma-gtk4 , libgnomekbd , gnome-desktop , gsettings-desktop-schemas @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "44.beta"; + version = "44.rc"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JACs9fFjtpoHtWB7VieWYHWHOx9ITVVLpugBa9VfCEY="; + sha256 = "Gy+x3fS7hWj/Du3Wqz19V7ider7iICt7hTmtu6gV55g="; }; patches = [ @@ -164,7 +164,7 @@ stdenv.mkDerivation rec { # not declared at build time, but typelib is needed at runtime libgweather - libnma + libnma-gtk4 # for gnome-extension tool bash-completion @@ -177,6 +177,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" + "-Dtests=false" ]; postPatch = '' @@ -185,6 +186,13 @@ stdenv.mkDerivation rec { # We can generate it ourselves. rm -f man/gnome-shell.1 rm data/theme/gnome-shell.css + + # Build fails with -Dgtk_doc=true + # https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6486 + # element include: XInclude error : could not load xxx, and no fallback was found + substituteInPlace docs/reference/shell/shell-docs.sgml \ + --replace '<xi:include href="xml/shell-embedded-window.xml"/>' ' ' \ + --replace '<xi:include href="xml/shell-gtk-embed.xml"/>' ' ' ''; postInstall = '' |