From fda25f88d238899ecdc2b195e00855db24b761b7 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Fri, 17 Sep 2021 22:15:44 -0700 Subject: [PATCH] vimpager: supply runtimeShell to Makefile Cross-compiles will otherwise detect an incorrect shell. --- pkgs/tools/misc/vimpager/build.nix | 1 + pkgs/tools/misc/vimpager/latest.nix | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix index a610a461656..c77f623c5dc 100644 --- a/pkgs/tools/misc/vimpager/build.nix +++ b/pkgs/tools/misc/vimpager/build.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , coreutils , sharutils +, runtimeShell , version , sha256 }: diff --git a/pkgs/tools/misc/vimpager/latest.nix b/pkgs/tools/misc/vimpager/latest.nix index c98b9a00014..4ea8d5be57f 100644 --- a/pkgs/tools/misc/vimpager/latest.nix +++ b/pkgs/tools/misc/vimpager/latest.nix @@ -1,7 +1,10 @@ -{ callPackage }: +{ callPackage, runtimeShell }: -callPackage ./build.nix { +(callPackage ./build.nix { version = "a4da4dfac44d1bbc6986c5c76fea45a60ebdd8e5"; sha256 = "0gcjpw2q263hh8w2sjvq3f3k2d28qpkkv0jnl8hw1l7v604i8zxg"; -} - +}).overrideAttrs (old: { + postPatch = old.postPatch or "" + '' + echo 'echo ${runtimeShell}' > scripts/find_shell + ''; +})