various: replace substituteAll with replaceVars

Some easy ones.
This commit is contained in:
Wolfgang Walther 2025-01-26 16:37:03 +01:00
parent e2afb6a831
commit a8f509677f
No known key found for this signature in database
GPG Key ID: B39893FA5F65CAE1
5 changed files with 8 additions and 14 deletions

View File

@ -1,5 +1,3 @@
#! @perl@ -w
use strict;
use feature 'signatures';
use Cwd 'abs_path';

View File

@ -5,13 +5,12 @@
buildPackages,
runCommand,
lib,
substituteAll,
replaceVars,
writeClosure,
}:
let
builder = substituteAll {
src = ./builder.pl;
builder = replaceVars ./builder.pl {
inherit (builtins) storeDir;
};
in

View File

@ -5,7 +5,7 @@
fetchFromGitHub,
fetchurl,
pythonOlder,
substituteAll,
replaceVars,
# build
libpq,
@ -45,8 +45,7 @@ let
};
patches = [
(substituteAll {
src = ./ctypes.patch;
(replaceVars ./ctypes.patch {
libpq = "${libpq}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}";
libc = "${stdenv.cc.libc}/lib/libc.so.6";
})

View File

@ -13,7 +13,7 @@
pythonAtLeast,
pytestCheckHook,
setuptools,
substituteAll,
replaceVars,
tree,
xclip,
}:
@ -32,8 +32,7 @@ buildPythonPackage rec {
# Set absolute nix store paths to the executables that pypass uses
patches = [
(substituteAll {
src = ./mark-executables.patch;
(replaceVars ./mark-executables.patch {
git_exec = "${gitMinimal}/bin/git";
grep_exec = "${gnugrep}/bin/grep";
gpg_exec = "${gnupg}/bin/gpg2";

View File

@ -7,7 +7,7 @@ let
fetchpatch,
fetchurl,
lib,
substituteAll,
replaceVars,
writeShellScriptBin,
# source specification
@ -304,8 +304,7 @@ let
hash = "sha256-EQJkDR0eb7QWCjyMzXMn+Vbcwx3MMdC83oN7XSVJP0U=";
})
(substituteAll {
src = ./patches/locale-binary-path.patch;
(replaceVars ./patches/locale-binary-path.patch {
locale = "${
if stdenv.hostPlatform.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc
}/bin/locale";