diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-03-31 20:44:33 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-31 20:44:33 +0800 |
| commit | 705a678726537825f91550a91531d026e855b50e (patch) | |
| tree | 3ae9dbf331bad6c4fe0d368efff01f1b8ce3d3a8 /pkgs/applications | |
| parent | 16c5f5534dff5fe09cf53a1f08d6d94ef5eadb19 (diff) | |
| parent | 16608a048ec426205becb4e3e087cb8f2f21cbae (diff) | |
| download | nixlib-705a678726537825f91550a91531d026e855b50e.tar nixlib-705a678726537825f91550a91531d026e855b50e.tar.gz nixlib-705a678726537825f91550a91531d026e855b50e.tar.bz2 nixlib-705a678726537825f91550a91531d026e855b50e.tar.lz nixlib-705a678726537825f91550a91531d026e855b50e.tar.xz nixlib-705a678726537825f91550a91531d026e855b50e.tar.zst nixlib-705a678726537825f91550a91531d026e855b50e.zip | |
Merge pull request #166406 from bobby285271/icon-library
icon-library: fix build with meson 0.61
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/icon-library/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/applications/graphics/icon-library/default.nix index 4dd97d92217d..4f16a0d6e2d8 100644 --- a/pkgs/applications/graphics/icon-library/default.nix +++ b/pkgs/applications/graphics/icon-library/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook +{ lib, stdenv, fetchurl, fetchpatch, wrapGAppsHook4 , cargo, desktop-file-utils, meson, ninja, pkg-config, rustc , gdk-pixbuf, glib, gtk4, gtksourceview5, libadwaita }: @@ -12,8 +12,18 @@ stdenv.mkDerivation rec { sha256 = "1zrcnc5dn5fgcl3vklfpbp3m0qzi2n2viw59vw5fhwkysvp670y7"; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:85:0: ERROR: gnome.compile_resources takes exactly 2 arguments, but got 3. + # https://gitlab.gnome.org/World/design/icon-library/-/merge_requests/54 + (fetchpatch { + url = "https://gitlab.gnome.org/World/design/icon-library/-/commit/c629dbf6670f9bb0b98ff21c17110489b58f5c85.patch"; + sha256 = "UKC1CPaM58/z0zINN794luWZdoFx1zGxETPb8VtbO3E="; + }) + ]; + nativeBuildInputs = [ - cargo desktop-file-utils meson ninja pkg-config rustc wrapGAppsHook + cargo desktop-file-utils meson ninja pkg-config rustc wrapGAppsHook4 ]; buildInputs = [ gdk-pixbuf glib gtk4 gtksourceview5 libadwaita ]; |