git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #166406 from bobby285271/icon-library

icon-library: fix build with meson 0.61

commit705a678726537825f91550a91531d026e855b50e authorBobby Rong <rjl931189261@126.com> dateThu 31 Mar 2022, 20:44 (5 years ago) parent16c5f5516608a0
1 file changed+12−2
pkgs/applications/graphics/icon-library/default.nix+12−2
pkgs/applications/graphics/icon-library/default.nix+12−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, wrapGAppsHook
1+{ lib, stdenv, fetchurl, fetchpatch, wrapGAppsHook4
22, cargo, desktop-file-utils, meson, ninja, pkg-config, rustc
33, gdk-pixbuf, glib, gtk4, gtksourceview5, libadwaita
44}:
@@ -12,8 +12,18 @@ stdenv.mkDerivation rec {
1212 sha256 = "1zrcnc5dn5fgcl3vklfpbp3m0qzi2n2viw59vw5fhwkysvp670y7";
1313 };
1414
15+ patches = [
16+ # Fix build with meson 0.61
17+ # data/meson.build:85:0: ERROR: gnome.compile_resources takes exactly 2 arguments, but got 3.
18+ # https://gitlab.gnome.org/World/design/icon-library/-/merge_requests/54
19+ (fetchpatch {
20+ url = "https://gitlab.gnome.org/World/design/icon-library/-/commit/c629dbf6670f9bb0b98ff21c17110489b58f5c85.patch";
21+ sha256 = "UKC1CPaM58/z0zINN794luWZdoFx1zGxETPb8VtbO3E=";
22+ })
23+ ];
24+
1525 nativeBuildInputs = [
16− cargo desktop-file-utils meson ninja pkg-config rustc wrapGAppsHook
26+ cargo desktop-file-utils meson ninja pkg-config rustc wrapGAppsHook4
1727 ];
1828 buildInputs = [ gdk-pixbuf glib gtk4 gtksourceview5 libadwaita ];
1929