summary refs log tree commit diff
path: root/pkgs/desktops/gnome/core/gnome-shell/default.nix
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2022-02-16 18:34:59 +0000
committerJan Tojnar <jtojnar@gmail.com>2022-03-25 15:01:25 +0100
commit657d2f8f7e13ca2f7c0793a9f977311908442a07 (patch)
tree3a60f4d39d1c4236f81ae95c7b0b0a252f5341ad /pkgs/desktops/gnome/core/gnome-shell/default.nix
parent4e2857a1256a1c8dacfc9fe15e077c72444bf835 (diff)
downloadnixpkgs-657d2f8f7e13ca2f7c0793a9f977311908442a07.tar
nixpkgs-657d2f8f7e13ca2f7c0793a9f977311908442a07.tar.gz
nixpkgs-657d2f8f7e13ca2f7c0793a9f977311908442a07.tar.bz2
nixpkgs-657d2f8f7e13ca2f7c0793a9f977311908442a07.tar.lz
nixpkgs-657d2f8f7e13ca2f7c0793a9f977311908442a07.tar.xz
nixpkgs-657d2f8f7e13ca2f7c0793a9f977311908442a07.tar.zst
nixpkgs-657d2f8f7e13ca2f7c0793a9f977311908442a07.zip
gnome.gnome-shell: 41.3 → 42.beta
https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/41.3...42.beta
Diffstat (limited to 'pkgs/desktops/gnome/core/gnome-shell/default.nix')
-rw-r--r--pkgs/desktops/gnome/core/gnome-shell/default.nix15
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix
index 3b89ceb7817..07ccb0f516c 100644
--- a/pkgs/desktops/gnome/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix
@@ -46,6 +46,7 @@
 , evolution-data-server
 , gtk3
 , gtk4
+, libadwaita
 , sassc
 , systemd
 , pipewire
@@ -66,13 +67,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gnome-shell";
-  version = "41.4";
+  version = "42.beta";
 
   outputs = [ "out" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "x+73SvMEZJwDuG25m9C6x1oBH7/2d0yO41WD282tivQ=";
+    sha256 = "2jVPkpxtq0gK/7GpzpFyVRc5CuIfV0R/TB8QW/HR0Rc=";
   };
 
   patches = [
@@ -118,7 +119,6 @@ stdenv.mkDerivation rec {
     sassc
     desktop-file-utils
     libxslt.bin
-    python3
     asciidoc
   ];
 
@@ -142,6 +142,7 @@ stdenv.mkDerivation rec {
     libical
     gtk3
     gtk4
+    libadwaita
     gdm
     geoclue2
     adwaita-icon-theme
@@ -169,6 +170,9 @@ stdenv.mkDerivation rec {
     bash-completion
     gnome-autoar
     json-glib
+
+    # for tools
+    pythonEnv
   ];
 
   mesonFlags = [
@@ -177,14 +181,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs src/data-to-c.pl
-    chmod +x meson/postinstall.py
-    patchShebangs meson/postinstall.py
 
     # We can generate it ourselves.
     rm -f man/gnome-shell.1
-
-    substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
-    substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
   '';
 
   preFixup = ''