cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

gnome.caribou: build with latest vala

Browse source
This commit is contained in:
Bobby Rong 2021-12-03 15:40:22 +08:00
parent 68c81b1132
commit 17aff7a84b
No known key found for this signature in database
GPG key ID: ED07364437C91161
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/desktops/gnome/core/caribou/default.nix
View file

@ -1,6 +1,6 @@
{ fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2 { fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2
, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook
, wrapGAppsHook, libgee, vala_0_40 }: , wrapGAppsHook, libgee, vala }:
let let
pname = "caribou"; pname = "caribou";
@ -21,6 +21,11 @@ in stdenv.mkDerivation rec {
url = "https://bugzilla.gnome.org/attachment.cgi?id=364774"; url = "https://bugzilla.gnome.org/attachment.cgi?id=364774";
sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd"; 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 { (fetchurl {
name = "fix-build-modern-vala.patch"; name = "fix-build-modern-vala.patch";
url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/76fbd11575f918fc898cb0f5defe07f67c11ec38.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 = [ buildInputs = [
glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3