nvimpager: push cross compilation fix upstream

This commit is contained in:
2025-03-18 07:19:49 +00:00
parent fc426b5c0b
commit 9b1db9aa18
2 changed files with 19 additions and 10 deletions

View File

@@ -642,16 +642,18 @@ in with final; {
# # buildInputs = lib.remove gnupg upstream.buildInputs;
# });
# 2025/02/10: upstreaming is blocked on ruby
nvimpager = prev.nvimpager.overrideAttrs (upstream: {
# fix so nvimpager specifies host machine sh as interpreter, not build sh
buildInputs = upstream.buildInputs ++ [
bash
];
postFixup = (upstream.postFixup or "") + ''
patchShebangs --update --host $out/bin/nvimpager
'';
});
# 2025/03/17: out for PR <https://github.com/NixOS/nixpkgs/pull/390878>
# full cross compilation is blocked on ruby though; this only works by me manually
# overriding neovim to build w/o ruby
# nvimpager = prev.nvimpager.overrideAttrs (upstream: {
# # fix so nvimpager specifies host machine sh as interpreter, not build sh
# buildInputs = upstream.buildInputs ++ [
# bash
# ];
# postFixup = (upstream.postFixup or "") + ''
# patchShebangs --update --host $out/bin/nvimpager
# '';
# });
# 2025/01/25: upstreaming is unblocked
papers = prev.papers.override {

View File

@@ -47,6 +47,13 @@ in
hash = "sha256-SStQSD4T7JI9GEjnH92P3TXR/OMZNuCs3bT3vFLbQqw=";
})
(fetchpatch' {
name = "nvimpager: enable strictDeps & cleanup inputs";
prUrl = "https://github.com/NixOS/nixpkgs/pull/390878";
# saneCommit = "e55b9041bc27a89549995a8d5f4f458f770ae8fd";
hash = "sha256-Fi+seOOkErufBatEzSVcLM8Fj8ZUcvHNIbkpf+RIFLo=";
})
(fetchpatch' {
# 2025-03-14: merged into staging-next
name = "[staging-next] pipewire: fix cross compilation";