alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #166406 from bobby285271/icon-library

Browse source 
icon-library: fix build with meson 0.61
This commit is contained in:
Bobby Rong 2022-03-31 20:44:33 +08:00 committed by GitHub
parent 16c5f5534d 16608a048e
commit 705a678726
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/graphics/icon-library/default.nix
View file

@ -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 ];