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

cross: hspell: push upstream

Browse Source
This commit is contained in:
Colin 2023-10-24 16:53:24 +00:00
parent 5f789b3db2
commit 841fb4bf7a
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixpatches/list.nix
View File

@ -47,6 +47,11 @@ in [
# hash = "sha256-vageRWYIJrB5hEXEvLfPTVlOvJOT3BPpIx6NH98f7cM="; # hash = "sha256-vageRWYIJrB5hEXEvLfPTVlOvJOT3BPpIx6NH98f7cM=";
hash = "sha256-XTVMC2Q3RAXz7o4/5UT2hCBsNy/m/+XK2bKhBwYG918="; hash = "sha256-XTVMC2Q3RAXz7o4/5UT2hCBsNy/m/+XK2bKhBwYG918=";
}) })
(fetchpatch' {
title = "hspell: remove build perl from runtime closure";
prUrl = "https://github.com/NixOS/nixpkgs/pull/263182";
hash = "sha256-Wau+PB+EUQDvWX8Kycw1sNrM3GkPVjKSS4niIDI0sjM=";
})
(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";

17
overlays/cross.nix
View File

@ -894,14 +894,15 @@ in {
# inherit (emulated) stdenv; # inherit (emulated) stdenv;
# }; # };
hspell = prev.hspell.overrideAttrs (upstream: { # out for PR: <https://github.com/NixOS/nixpkgs/pull/263182>
# build perl is needed by the Makefile, # hspell = prev.hspell.overrideAttrs (upstream: {
# but $out/bin/multispell (which is simply copied from src) should use host perl # # build perl is needed by the Makefile,
buildInputs = (upstream.buildInputs or []) ++ [ final.perl ]; # # but $out/bin/multispell (which is simply copied from src) should use host perl
postInstall = '' # buildInputs = (upstream.buildInputs or []) ++ [ final.perl ];
patchShebangs --update $out/bin/multispell # postInstall = ''
''; # patchShebangs --update $out/bin/multispell
}); # '';
# });
# "setup: line 1595: ant: command not found" # "setup: line 1595: ant: command not found"
# i2p = mvToNativeInputs [ final.ant final.gettext ] prev.i2p; # i2p = mvToNativeInputs [ final.ant final.gettext ] prev.i2p;