diff options
author | Bobby Rong <rjl931189261@126.com> | 2022-03-30 19:17:17 +0800 |
---|---|---|
committer | Bobby Rong <rjl931189261@126.com> | 2022-03-30 19:17:17 +0800 |
commit | 739e7ceeff37bcd5a4b548e4e944a8b95a8c0d0c (patch) | |
tree | c86318e6a937d785c7f82ec224e9a20e55d8db83 /pkgs/applications | |
parent | 6a079dad158f0331e866da8d1da443065deba6fa (diff) | |
download | nixlib-739e7ceeff37bcd5a4b548e4e944a8b95a8c0d0c.tar nixlib-739e7ceeff37bcd5a4b548e4e944a8b95a8c0d0c.tar.gz nixlib-739e7ceeff37bcd5a4b548e4e944a8b95a8c0d0c.tar.bz2 nixlib-739e7ceeff37bcd5a4b548e4e944a8b95a8c0d0c.tar.lz nixlib-739e7ceeff37bcd5a4b548e4e944a8b95a8c0d0c.tar.xz nixlib-739e7ceeff37bcd5a4b548e4e944a8b95a8c0d0c.tar.zst nixlib-739e7ceeff37bcd5a4b548e4e944a8b95a8c0d0c.zip |
icon-library: fix build with meson 0.61
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/graphics/icon-library/default.nix | 12 |
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 4dd97d92217d..791a7469a025 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 ]; |