diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-23 06:49:49 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-05-05 22:42:54 +0200 |
| commit | 14a1fc1e4b064b4504d09a5fd1069666c2e0a4a1 (patch) | |
| tree | 461b88dbe7d8eec1a4e6568451a2eccb29076862 /pkgs/desktops/gnome-3/apps | |
| parent | 3a669c7106e580d8dcb1294204f5071599ea7bf6 (diff) | |
| download | nixpkgs-14a1fc1e4b064b4504d09a5fd1069666c2e0a4a1.tar nixpkgs-14a1fc1e4b064b4504d09a5fd1069666c2e0a4a1.tar.gz nixpkgs-14a1fc1e4b064b4504d09a5fd1069666c2e0a4a1.tar.bz2 nixpkgs-14a1fc1e4b064b4504d09a5fd1069666c2e0a4a1.tar.lz nixpkgs-14a1fc1e4b064b4504d09a5fd1069666c2e0a4a1.tar.xz nixpkgs-14a1fc1e4b064b4504d09a5fd1069666c2e0a4a1.tar.zst nixpkgs-14a1fc1e4b064b4504d09a5fd1069666c2e0a4a1.zip | |
gnome3.cheese: fix build
Diffstat (limited to 'pkgs/desktops/gnome-3/apps')
| -rw-r--r-- | pkgs/desktops/gnome-3/apps/cheese/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index 04c6b31563c..6558705514c 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , gettext , fetchurl +, fetchpatch , wrapGAppsHook , gnome-video-effects , libcanberra-gtk3 @@ -18,7 +19,6 @@ , docbook_xsl , appstream-glib , libxslt -, yelp-tools , gnome-common , gtk-doc , adwaita-icon-theme @@ -43,6 +43,14 @@ stdenv.mkDerivation rec { sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8"; }; + patches = [ + # Fix build with latest Vala or GLib + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/cheese/commit/7cf6268e54620bbbe5e6e61800c50fb0cb4bea57.patch"; + sha256 = "WJgGNrpZLTahe7Sxr8HdTl+4Mf4VcmJb6DdiInlDcT4="; + }) + ]; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py @@ -68,7 +76,6 @@ stdenv.mkDerivation rec { python3 vala wrapGAppsHook - yelp-tools ]; buildInputs = [ |