@@ -16,14 +16,11 @@
1616, granite
1717, libgee
1818, bamf
19−, libcanberra
2019, libcanberra-gtk3
2120, gnome-desktop
2221, mutter
2322, clutter
24−, elementary-dock
2523, elementary-icon-theme
26−, elementary-settings-daemon
2724, gnome-settings-daemon
2825, wrapGAppsHook
2926, gexiv2
@@ -31,23 +28,22 @@
3128
3229stdenv.mkDerivation rec {
3330 pname = "gala";
34− version = "6.2.1";
31+ version = "6.3.0";
3532
3633 src = fetchFromGitHub {
3734 owner = "elementary";
3835 repo = pname;
3936 rev = version;
40− sha256 = "1phnhj731kvk8ykmm33ypcxk8fkfny9k6kdapl582qh4d47wcy6f";
37+ sha256 = "sha256-f/WDm9/+lXgplg9tGpct4f+1cOhKgdypwiDRBhewRGw=";
4138 };
4239
4340 patches = [
4441 ./plugins-dir.patch
45− # Multitasking view: Don't use smooth scroll events to handle mouse wheel
46− # Avoid breaking the multitasking view scroll once xf86-input-libinput 1.2.0 lands
47− # https://github.com/elementary/gala/pull/1266
42+ # Session crashes when switching windows with Alt+Tab
43+ # https://github.com/elementary/gala/issues/1312
4844 (fetchpatch {
49− url = "https://github.com/elementary/gala/commit/d2dcfdefdf97c1b49654179a7acd01ebfe017308.patch";
50− sha256 = "sha256-2lKrCz3fSjrfKfysuUHzeUjhmMm84K47n882CLpfAyg=";
45+ url = "https://github.com/elementary/gala/commit/cc83db8fe398feae9f3e4caa8352b65f0c8c96d4.patch";
46+ sha256 = "sha256-CPO3EHIzqHAV6ZLHngivCdsD8je8CK/NHznfxSEkhzc=";
5147 })
5248 ];
5349
@@ -66,20 +62,23 @@ stdenv.mkDerivation rec {
6662 buildInputs = [
6763 bamf
6864 clutter
69− elementary-dock
7065 elementary-icon-theme
71− elementary-settings-daemon
7266 gnome-settings-daemon
7367 gexiv2
7468 gnome-desktop
7569 granite
7670 gtk3
77− libcanberra
7871 libcanberra-gtk3
7972 libgee
8073 mutter
8174 ];
8275
76+ mesonFlags = [
77+ # TODO: enable this and remove --builtin flag from session-settings
78+ # https://github.com/NixOS/nixpkgs/pull/140429
79+ "-Dsystemd=false"
80+ ];
81+
8382 postPatch = ''
8483 chmod +x build-aux/meson/post_install.py
8584 patchShebangs build-aux/meson/post_install.py
@@ -91,7 +90,7 @@ stdenv.mkDerivation rec {
9190 };
9291 };
9392
94− meta = with lib; {
93+ meta = with lib; {
9594 description = "A window & compositing manager based on mutter and designed by elementary for use with Pantheon";
9695 homepage = "https://github.com/elementary/gala";
9796 license = licenses.gpl3Plus;