nvimpager: push cross compilation fix upstream
This commit is contained in:
@@ -642,16 +642,18 @@ in with final; {
|
|||||||
# # buildInputs = lib.remove gnupg upstream.buildInputs;
|
# # buildInputs = lib.remove gnupg upstream.buildInputs;
|
||||||
# });
|
# });
|
||||||
|
|
||||||
# 2025/02/10: upstreaming is blocked on ruby
|
# 2025/03/17: out for PR <https://github.com/NixOS/nixpkgs/pull/390878>
|
||||||
nvimpager = prev.nvimpager.overrideAttrs (upstream: {
|
# full cross compilation is blocked on ruby though; this only works by me manually
|
||||||
# fix so nvimpager specifies host machine sh as interpreter, not build sh
|
# overriding neovim to build w/o ruby
|
||||||
buildInputs = upstream.buildInputs ++ [
|
# nvimpager = prev.nvimpager.overrideAttrs (upstream: {
|
||||||
bash
|
# # fix so nvimpager specifies host machine sh as interpreter, not build sh
|
||||||
];
|
# buildInputs = upstream.buildInputs ++ [
|
||||||
postFixup = (upstream.postFixup or "") + ''
|
# bash
|
||||||
patchShebangs --update --host $out/bin/nvimpager
|
# ];
|
||||||
'';
|
# postFixup = (upstream.postFixup or "") + ''
|
||||||
});
|
# patchShebangs --update --host $out/bin/nvimpager
|
||||||
|
# '';
|
||||||
|
# });
|
||||||
|
|
||||||
# 2025/01/25: upstreaming is unblocked
|
# 2025/01/25: upstreaming is unblocked
|
||||||
papers = prev.papers.override {
|
papers = prev.papers.override {
|
||||||
|
@@ -47,6 +47,13 @@ in
|
|||||||
hash = "sha256-SStQSD4T7JI9GEjnH92P3TXR/OMZNuCs3bT3vFLbQqw=";
|
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' {
|
(fetchpatch' {
|
||||||
# 2025-03-14: merged into staging-next
|
# 2025-03-14: merged into staging-next
|
||||||
name = "[staging-next] pipewire: fix cross compilation";
|
name = "[staging-next] pipewire: fix cross compilation";
|
||||||
|
Reference in New Issue
Block a user