Merge pull request #309290 from eclairevoyant/font-manager-fix

font-manager: fix build with newer vala

authored by Pol Dellaiera and committed by GitHub 80dd7b26 a91ef9ed

+11
+11
pkgs/applications/misc/font-manager/default.nix
··· 16 , gtk3 17 , gnome 18 , desktop-file-utils 19 , wrapGAppsHook3 20 , gobject-introspection 21 # withWebkit enables the "webkit" feature, also known as Google Fonts ··· 32 rev = version; 33 hash = "sha256-M13Q9d2cKhc0tudkvw0zgqPAFTlmXwK+LltXeuDPWxo="; 34 }; 35 36 nativeBuildInputs = [ 37 pkg-config
··· 16 , gtk3 17 , gnome 18 , desktop-file-utils 19 + , fetchpatch2 20 , wrapGAppsHook3 21 , gobject-introspection 22 # withWebkit enables the "webkit" feature, also known as Google Fonts ··· 33 rev = version; 34 hash = "sha256-M13Q9d2cKhc0tudkvw0zgqPAFTlmXwK+LltXeuDPWxo="; 35 }; 36 + 37 + patches = [ 38 + # see https://github.com/FontManager/font-manager/issues/355 39 + # should be removed on next release 40 + (fetchpatch2 { 41 + name = "fix-build-with-newer-vala.patch"; 42 + url = "https://github.com/FontManager/font-manager/commit/600f498946c3904064b4e4fdf96e5841f6a827e4.patch"; 43 + hash = "sha256-DC9+pvG88t+PPdGQ2oemeEYK9PaD0C2yWBYYCh4Wn9g="; 44 + }) 45 + ]; 46 47 nativeBuildInputs = [ 48 pkg-config