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 strict;
use feature 'signatures'; use feature 'signatures';
use Cwd 'abs_path'; use Cwd 'abs_path';

View file

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

View file

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

View file

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

View file

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