From 9b1db9aa1831ca1c9441388e9cd3d77d67c9084b Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Tue, 18 Mar 2025 07:19:49 +0000
Subject: [PATCH] nvimpager: push cross compilation fix upstream

---
 overlays/cross.nix                         | 22 ++++++++++++----------
 pkgs/by-name/nixpkgs-bootstrap/patches.nix |  7 +++++++
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/overlays/cross.nix b/overlays/cross.nix
index e16d9dbeb..1c214cfb7 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -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 {
diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
index 64b190262..14b6dddd9 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
@@ -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";