diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix')
-rw-r--r-- | nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix index 9b370847fc8..349b4cd63b5 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,5 +1,7 @@ { stdenv , fetchFromGitHub +, nix-update-script +, fetchpatch , pantheon , pkgconfig , meson @@ -18,7 +20,7 @@ , gnome-desktop , mutter , clutter -, plank +, elementary-dock , elementary-icon-theme , elementary-settings-daemon , wrapGAppsHook @@ -26,17 +28,17 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "03cq9ihgjasnv1n4v3dn1m3ypzj26k2ybd5b1a7yrbprb35zbrs4"; + sha256 = "sha256-BOarHUEgWqQM6jmVMauJi0JnsM+jE45MnPNnAqz1qOE="; }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; @@ -56,19 +58,26 @@ stdenv.mkDerivation rec { buildInputs = [ bamf clutter + elementary-dock elementary-icon-theme - gnome-desktop elementary-settings-daemon + gnome-desktop granite gtk3 libcanberra libcanberra-gtk3 libgee mutter - plank ]; patches = [ + # https://github.com/elementary/gala/pull/869 + # build failure in vala 0.48.7 + # https://github.com/elementary/gala/pull/869#issuecomment-657147695 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/85d290c75eaa147b704ad34e6c67498071707ee8.patch"; + sha256 = "19jkvmxidf453qfrxkvi35igxzfz2cm8srwkabvyn9wyd1yhiw0l"; + }) ./plugins-dir.patch ./use-new-notifications-default.patch ]; |