diff options
| author | Bobby Rong <rjl931189261@126.com> | 2021-12-03 15:40:22 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2021-12-03 22:48:31 +0800 |
| commit | 17aff7a84b61c607fdc0df5730e6a00bf8dff806 (patch) | |
| tree | b8b5ed824bc144e0a61dfd9169649f2e29f6e69c /pkgs/desktops/gnome/core/caribou | |
| parent | 68c81b1132e0cd872c06aa9e51d9c8779bdbac5a (diff) | |
| download | nixpkgs-17aff7a84b61c607fdc0df5730e6a00bf8dff806.tar nixpkgs-17aff7a84b61c607fdc0df5730e6a00bf8dff806.tar.gz nixpkgs-17aff7a84b61c607fdc0df5730e6a00bf8dff806.tar.bz2 nixpkgs-17aff7a84b61c607fdc0df5730e6a00bf8dff806.tar.lz nixpkgs-17aff7a84b61c607fdc0df5730e6a00bf8dff806.tar.xz nixpkgs-17aff7a84b61c607fdc0df5730e6a00bf8dff806.tar.zst nixpkgs-17aff7a84b61c607fdc0df5730e6a00bf8dff806.zip | |
gnome.caribou: build with latest vala
Diffstat (limited to 'pkgs/desktops/gnome/core/caribou')
| -rw-r--r-- | pkgs/desktops/gnome/core/caribou/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome/core/caribou/default.nix b/pkgs/desktops/gnome/core/caribou/default.nix index 50fb1c3de56..2afb65d528e 100644 --- a/pkgs/desktops/gnome/core/caribou/default.nix +++ b/pkgs/desktops/gnome/core/caribou/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook -, wrapGAppsHook, libgee, vala_0_40 }: +, wrapGAppsHook, libgee, vala }: let pname = "caribou"; @@ -21,6 +21,11 @@ in stdenv.mkDerivation rec { url = "https://bugzilla.gnome.org/attachment.cgi?id=364774"; sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd"; }) + # Stop patching the generated GIR, fixes build with latest vala + (fetchurl { + url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/c52ce71c49dc8d6109a58d16cc8d491d7bd1d781.patch"; + sha256 = "sha256-jbF1Ygp8Q0ENN/5aEpROuK5zkufIfn6cGW8dncl7ET4="; + }) (fetchurl { name = "fix-build-modern-vala.patch"; url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/76fbd11575f918fc898cb0f5defe07f67c11ec38.patch"; @@ -33,7 +38,7 @@ in stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook vala_0_40 ]; + nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook vala ]; buildInputs = [ glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 |