about summary refs log tree commit diff
path: root/pkgs/applications/graphics/icon-library
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-03-30 19:17:17 +0800
committerBobby Rong <rjl931189261@126.com>2022-03-30 19:17:17 +0800
commit739e7ceeff37bcd5a4b548e4e944a8b95a8c0d0c (patch)
treec86318e6a937d785c7f82ec224e9a20e55d8db83 /pkgs/applications/graphics/icon-library
parent6a079dad158f0331e866da8d1da443065deba6fa (diff)
icon-library: fix build with meson 0.61
Diffstat (limited to 'pkgs/applications/graphics/icon-library')
-rw-r--r--pkgs/applications/graphics/icon-library/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/applications/graphics/icon-library/default.nix
index 4dd97d92217d6..791a7469a0252 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, wrapGAppsHook
 , cargo, desktop-file-utils, meson, ninja, pkg-config, rustc
 , gdk-pixbuf, glib, gtk4, gtksourceview5, libadwaita
 }:
@@ -12,6 +12,16 @@ 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
   ];