From 841fb4bf7a3b29bc121c4ed337d7f4cef172a031 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 24 Oct 2023 16:53:24 +0000 Subject: [PATCH] cross: hspell: push upstream --- nixpatches/list.nix | 5 +++++ overlays/cross.nix | 17 +++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 145e82ac..a11e90d5 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -47,6 +47,11 @@ in [ # hash = "sha256-vageRWYIJrB5hEXEvLfPTVlOvJOT3BPpIx6NH98f7cM="; 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' { title = "trust-dns: 0.23.0 -> 0.24.0"; prUrl = "https://github.com/NixOS/nixpkgs/pull/263054"; diff --git a/overlays/cross.nix b/overlays/cross.nix index 67955943..38bfa112 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -894,14 +894,15 @@ in { # inherit (emulated) stdenv; # }; - hspell = prev.hspell.overrideAttrs (upstream: { - # build perl is needed by the Makefile, - # but $out/bin/multispell (which is simply copied from src) should use host perl - buildInputs = (upstream.buildInputs or []) ++ [ final.perl ]; - postInstall = '' - patchShebangs --update $out/bin/multispell - ''; - }); + # out for PR: + # hspell = prev.hspell.overrideAttrs (upstream: { + # # build perl is needed by the Makefile, + # # but $out/bin/multispell (which is simply copied from src) should use host perl + # buildInputs = (upstream.buildInputs or []) ++ [ final.perl ]; + # postInstall = '' + # patchShebangs --update $out/bin/multispell + # ''; + # }); # "setup: line 1595: ant: command not found" # i2p = mvToNativeInputs [ final.ant final.gettext ] prev.i2p;