colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cross: gspell: push upstream

Browse Source
This commit is contained in:
Colin 2023-10-24 13:06:52 +00:00
parent 21912f0c4f
commit 1af7450610
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixpatches/list.nix
View File

@ -26,6 +26,13 @@ in [
# hash = "sha256-tKeumQ1R/UWTL2J9RaGs8p9QHxGxP2a1DevHnX/ElRU="; # hash = "sha256-tKeumQ1R/UWTL2J9RaGs8p9QHxGxP2a1DevHnX/ElRU=";
hash = "sha256-W9IS3JNPk5LkJeuZ+EL8NIv8+v7wEZo8Gt+ofq3RrrY="; hash = "sha256-W9IS3JNPk5LkJeuZ+EL8NIv8+v7wEZo8Gt+ofq3RrrY=";
}) })
(fetchpatch' {
title = "gspell: enable vala for cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/263135";
saneCommit = "293bfdc031a1eaa5cc571000977df14b6d8237c8";
# hash = "sha256-n6xatVeqMweuy/bm68cxWUkgUoS+H1xNRjT0JDFXeEs=";
hash = "sha256-PXatkvLjEgQJ4rRIjEOadKscM0WYWTozIFt2vzWOMKY=";
})
(fetchpatch' { (fetchpatch' {
title = "trust-dns: 0.23.0 -> 0.24.0"; title = "trust-dns: 0.23.0 -> 0.24.0";
prUrl = "https://github.com/NixOS/nixpkgs/pull/263054"; prUrl = "https://github.com/NixOS/nixpkgs/pull/263054";

23
overlays/cross.nix
View File

@ -864,17 +864,18 @@ in {
# # remove logic which was removing introspection/vala on cross compilation # # remove logic which was removing introspection/vala on cross compilation
# mesonFlags = []; # mesonFlags = [];
# }); # });
gspell = prev.gspell.overrideAttrs (upstream: { # 2023/10/23: out for review: <https://github.com/NixOS/nixpkgs/pull/263135>
depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ # gspell = prev.gspell.overrideAttrs (upstream: {
# without this, vapi files ($dev/share/vapi/vala/gspell-1.vapi) aren't generated. # depsBuildBuild = (upstream.depsBuildBuild or []) ++ [
# that breaks consumers like `gnome.geary` # # without this, vapi files ($dev/share/vapi/vala/gspell-1.vapi) aren't generated.
final.pkg-config # # that breaks consumers like `gnome.geary`
]; # final.pkg-config
configureFlags = upstream.configureFlags ++ [ # ];
# not necessary, but enforces that we really do produce vapi files # configureFlags = upstream.configureFlags ++ [
"--enable-vala" # # not necessary, but enforces that we really do produce vapi files
]; # "--enable-vala"
}); # ];
# });
# 2023/07/27: upstreaming is blocked on p11-kit, libavif cross compilation # 2023/07/27: upstreaming is blocked on p11-kit, libavif cross compilation
gvfs = prev.gvfs.overrideAttrs (upstream: { gvfs = prev.gvfs.overrideAttrs (upstream: {