0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00

treewide: replace substituteAll with replaceVars

This commit is contained in:
Wolfgang Walther 2025-01-25 16:28:57 +01:00
parent 2e43b87c62
commit b19d0f6d3d
No known key found for this signature in database
GPG key ID: B39893FA5F65CAE1
175 changed files with 444 additions and 608 deletions

View file

@ -16,8 +16,7 @@
# copy the config for nixos-rebuild
system.activationScripts.config =
let
config = pkgs.substituteAll {
src = ./incus-container-image-inner.nix;
config = pkgs.replaceVars ./incus-container-image-inner.nix {
stateVersion = lib.trivial.release;
};
in

View file

@ -16,8 +16,7 @@
# copy the config for nixos-rebuild
system.activationScripts.config =
let
config = pkgs.substituteAll {
src = ./incus-virtual-machine-image-inner.nix;
config = pkgs.replaceVars ./incus-virtual-machine-image-inner.nix {
stateVersion = lib.trivial.release;
};
in

View file

@ -18,8 +18,7 @@
# copy the config for nixos-rebuild
system.activationScripts.config =
let
config = pkgs.substituteAll {
src = ./lxd-container-image-inner.nix;
config = pkgs.replaceVars ./lxd-container-image-inner.nix {
stateVersion = lib.trivial.release;
};
in

View file

@ -18,8 +18,7 @@
# copy the config for nixos-rebuild
system.activationScripts.config =
let
config = pkgs.substituteAll {
src = ./lxd-virtual-machine-image-inner.nix;
config = pkgs.replaceVars ./lxd-virtual-machine-image-inner.nix {
stateVersion = lib.trivial.release;
};
in

View file

@ -832,11 +832,7 @@ in
{ source = config.isoImage.splashImage;
target = "/isolinux/background.png";
}
{ source = pkgs.substituteAll {
name = "isolinux.cfg";
src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg;
bootRoot = "/boot";
};
{ source = isolinuxCfg;
target = "/isolinux/isolinux.cfg";
}
{ source = "${pkgs.syslinux}/share/syslinux";

View file

@ -142,8 +142,7 @@ let
src = pkgs.runCommand "nixos-taskserver-src" { preferLocalBuild = true; } ''
mkdir -p "$out"
cat "${
pkgs.substituteAll {
src = ./helper-tool.py;
pkgs.replaceVars ./helper-tool.py {
inherit taskd certtool;
inherit (cfg)
dataDir

View file

@ -727,11 +727,13 @@ in
system.build.installBootLoader =
let
install-grub-pl = pkgs.substituteAll {
src = ./install-grub.pl;
install-grub-pl = pkgs.replaceVars ./install-grub.pl {
utillinux = pkgs.util-linux;
btrfsprogs = pkgs.btrfs-progs;
inherit (config.system.nixos) distroName;
# targets of a replacement in code
bootPath = null;
bootRoot = null;
};
perl = pkgs.perl.withPackages (p: with p; [
FileSlurp FileCopyRecursive

View file

@ -185,7 +185,6 @@ mkDerivation (finalAttrs: {
./native-comp-driver-options-30.patch
)
{
backendPath = (
lib.concatStringsSep " " (
builtins.map (x: ''"-B${x}"'') (

View file

@ -1,7 +1,7 @@
{
lib,
stdenv,
substituteAll,
replaceVars,
autoreconfHook,
pkg-config,
fetchurl,
@ -34,9 +34,10 @@ stdenv.mkDerivation {
strictDeps = true;
patches = [
(substituteAll {
src = ./fix-cli-paths.patch;
(replaceVars ./fix-cli-paths.patch {
inherit dropboxd;
# patch context
DESKTOP_FILE_DIR = null;
})
];

View file

@ -150,7 +150,7 @@ let
};
# replace @dir@ in the path of the given list of patches
fixupPatches = dir: map (patch: replaceVars patch { dir = dir; });
fixupPatches = dir: map (patch: replaceVars patch { inherit dir; });
in
{
z3_4_13 = common {

View file

@ -11,7 +11,7 @@
nlohmann_json,
qt5,
spdlog,
substituteAll,
replaceVars,
buildDayZLauncher ? false,
}:
stdenv.mkDerivation (finalAttrs: {
@ -27,8 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
# prevent CMake from trying to get libraries on the internet
(substituteAll {
src = ./dont_fetch_dependencies.patch;
(replaceVars ./dont_fetch_dependencies.patch {
argparse_src = fetchFromGitHub {
owner = "p-ranav";
repo = "argparse";

View file

@ -4,7 +4,7 @@
fetchFromGitLab,
go-md2man,
coreutils,
substituteAll,
replaceVars,
}:
stdenv.mkDerivation rec {
@ -19,9 +19,10 @@ stdenv.mkDerivation rec {
};
patches = [
(substituteAll {
src = ./udev-rule.patch;
(replaceVars ./udev-rule.patch {
inherit coreutils;
# patch context
group = null;
})
];

View file

@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
substituteAll,
replaceVars,
accountsservice,
adwaita-icon-theme,
budgie-desktop,
@ -81,13 +81,11 @@ stdenv.mkDerivation (finalAttrs: {
};
patches = [
(substituteAll {
src = ./paths.patch;
(replaceVars ./paths.patch {
budgie_desktop = budgie-desktop;
gcm = gnome-color-manager;
inherit
cups
glibc
libgnomekbd
shadow
;

View file

@ -17,7 +17,7 @@ index 2c1289a..8128362 100644
download_project(PROJ cudd
- URL https://sourceforge.net/projects/cudd-mirror/files/cudd-3.0.0.tar.gz/download
- URL_MD5 4fdafe4924b81648b908881c81fe6c30
+ SOURCE_DIR @cudd.src@
+ SOURCE_DIR @cudd@
)
if(NOT EXISTS ${cudd_SOURCE_DIR}/Makefile)

View file

@ -8,7 +8,7 @@
flex,
makeWrapper,
perl,
substituteAll,
replaceVars,
cudd,
nix-update-script,
fetchpatch,
@ -47,9 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
];
patches = [
(substituteAll {
src = ./0001-Do-not-download-sources-in-cmake.patch;
inherit cudd;
(replaceVars ./0001-Do-not-download-sources-in-cmake.patch {
cudd = cudd.src;
})
./0002-Do-not-download-sources-in-cmake.patch
# Fixes build with libc++ >= 19 due to the removal of std::char_traits<unsigned>.

View file

@ -5,7 +5,7 @@
gnused,
makeWrapper,
perlPackages,
substituteAll,
replaceVars,
xorg,
wrapGAppsHook3,
gitUpdater,
@ -23,10 +23,11 @@ perlPackages.buildPerlPackage rec {
};
patches = [
(substituteAll {
src = ./0001-Fix-paths.patch;
(replaceVars ./0001-Fix-paths.patch {
xmessage = xorg.xmessage;
inherit fluxbox gnused;
# replaced in postPatch
fbmenugen = null;
})
];

View file

@ -8,7 +8,7 @@
gradle_8,
bash,
coreutils,
substituteAll,
replaceVars,
nixosTests,
writeText,
}:
@ -50,14 +50,15 @@ stdenv.mkDerivation rec {
jdk
];
wrapper = substituteAll {
src = ./freenetWrapper;
wrapper = replaceVars ./freenetWrapper {
inherit
bash
coreutils
jre
seednodes
;
# replaced in installPhase
CLASSPATH = null;
};
mitmCache = gradle.fetchDeps {

View file

@ -27,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
(replaceVars ./remove-fetchcontent-usage.patch {
# Do not let cmake's fetchContent download unity
unitySrc = symlinkJoin {
name = "unity-with-iniparser-config";
paths = [
(fetchFromGitHub {
owner = "throwtheswitch";

View file

@ -12,7 +12,7 @@
ninja,
pkg-config,
python3,
substituteAll,
replaceVars,
zlib,
}:
@ -46,8 +46,7 @@ python3.pkgs.buildPythonApplication rec {
# are not as predictable, therefore we need to keep them in the RPATH.
# At the moment we are keeping the paths starting with /nix/store.
# https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634
(substituteAll {
src = ./001-fix-rpath.patch;
(replaceVars ./001-fix-rpath.patch {
inherit (builtins) storeDir;
})

View file

@ -1,7 +1,7 @@
{
lib,
runtimeShell,
substituteAll,
replaceVarsWith,
nix,
coreutils,
jq,
@ -12,23 +12,25 @@
cacert,
}:
substituteAll {
replaceVarsWith {
name = "nuget-to-json";
dir = "bin";
src = ./nuget-to-json.sh;
isExecutable = true;
inherit runtimeShell cacert;
binPath = lib.makeBinPath [
nix
coreutils
jq
xmlstarlet
curl
gnugrep
gawk
];
replacements = {
inherit runtimeShell cacert;
binPath = lib.makeBinPath [
nix
coreutils
jq
xmlstarlet
curl
gnugrep
gawk
];
};
meta = {
description = "Convert a nuget packages directory to a lockfile for buildDotnetModule";

View file

@ -1,7 +1,7 @@
{
lib,
runtimeShell,
substituteAll,
replaceVarsWith,
nix,
coreutils,
jq,
@ -13,24 +13,26 @@
cacert,
}:
substituteAll {
replaceVarsWith {
name = "nuget-to-nix";
dir = "bin";
src = ./nuget-to-nix.sh;
isExecutable = true;
inherit runtimeShell cacert;
binPath = lib.makeBinPath [
nix
coreutils
jq
xmlstarlet
curl
gnugrep
gawk
nuget-to-json
];
replacements = {
inherit runtimeShell cacert;
binPath = lib.makeBinPath [
nix
coreutils
jq
xmlstarlet
curl
gnugrep
gawk
nuget-to-json
];
};
meta = {
description = "Convert a nuget packages directory to a lockfile for buildDotnetModule";

View file

@ -1,7 +1,7 @@
{
stdenv,
lib,
substituteAll,
replaceVars,
pkg-config,
fetchurl,
python3Packages,
@ -47,16 +47,16 @@ stdenv.mkDerivation rec {
patches =
[
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
utillinux = util-linux;
# patch context
bindir = null;
})
]
++ lib.optionals (withEspeak && espeak.mbrolaSupport) [
# Replace FHS paths.
(substituteAll {
src = ./fix-mbrola-paths.patch;
inherit espeak mbrola;
(replaceVars ./fix-mbrola-paths.patch {
inherit mbrola;
})
];

View file

@ -2,7 +2,7 @@
lib,
stdenv,
fetchurl,
substituteAll,
replaceVars,
fetchpatch,
meson,
ninja,
@ -23,8 +23,7 @@ stdenv.mkDerivation rec {
patches =
[
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
inherit hwdata;
})
]

View file

@ -1,7 +1,7 @@
{
lib,
stdenv,
substituteAll,
replaceVars,
fetchurl,
fetchpatch,
findXMLCatalogs,
@ -50,8 +50,7 @@ let
})
# Add legacy sourceforge.net URIs to the catalog
(substituteAll {
src = ./catalog-legacy-uris.patch;
(replaceVars ./catalog-legacy-uris.patch {
inherit legacySuffix suffix version;
})
]

View file

@ -21,7 +21,6 @@
, smartmontools
, replaceVars
, stdenvNoCC
, substituteAll
, touchegg
, util-linux
, vte
@ -136,8 +135,7 @@ super: lib.trivial.pipe super [
});
in {
patches = [
(substituteAll {
src = ./extensionOverridesPatches/lunarcal_at_ailin.nemui.patch;
(replaceVars ./extensionOverridesPatches/lunarcal_at_ailin.nemui.patch {
chinese_calendar_path = chinese-calendar;
})
];

View file

@ -1,7 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, substituteAll
, replaceVars
, openssl
, gsound
, meson
@ -35,9 +35,10 @@ stdenv.mkDerivation rec {
patches = [
# Make typelibs available in the extension
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
gapplication = "${glib.bin}/bin/gapplication";
# Replaced in postPatch
typelibPath = null;
})
# Allow installing installed tests to a separate output

View file

@ -1,7 +1,7 @@
{
lib,
stdenv,
substituteAll,
replaceVars,
fetchFromGitHub,
taskwarrior2,
gettext,
@ -37,10 +37,8 @@ stdenv.mkDerivation rec {
];
patches = [
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
task = "${taskwarrior2}/bin/task";
shell = runtimeShell;
})
];

View file

@ -3,7 +3,7 @@
lib,
fetchFromGitLab,
gitUpdater,
substituteAll,
replaceVars,
testers,
dbus-test-runner,
dpkg,
@ -63,9 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./2001-Mark-problematic-tests.patch
(substituteAll {
src = ./2002-Nixpkgs-versioned-QML-path.patch.in;
name = "2002-Nixpkgs-versioned-QML-path.patch";
(replaceVars ./2002-Nixpkgs-versioned-QML-path.patch.in {
qtVersion = lib.versions.major qtbase.version;
})
];

View file

@ -2,7 +2,7 @@
lib,
stdenv,
fetchurl,
substituteAll,
replaceVars,
pkg-config,
gobject-introspection,
gdk-pixbuf,
@ -26,9 +26,10 @@ stdenv.mkDerivation rec {
};
patches = [
(substituteAll {
src = ./fix-cli-paths.patch;
(replaceVars ./fix-cli-paths.patch {
inherit dropboxd;
# patch context
DESKTOP_FILE_DIR = null;
})
];

View file

@ -4,7 +4,7 @@
, fetchurl
, fetchpatch
, lib
, substituteAll
, replaceVars
# Dependencies
, boehmgc
, coreutils
@ -95,8 +95,7 @@ let
};
patches = [
(substituteAll {
src = ./tzdata.patch;
(replaceVars ./tzdata.patch {
inherit tzdata;
})
]

View file

@ -1,12 +1,11 @@
{
substituteAll,
replaceVars,
callPackage,
}:
let
sigtool = callPackage ./sigtool.nix { };
in
substituteAll {
src = ./sign-apphost.proj;
replaceVars ./sign-apphost.proj {
codesign = "${sigtool}/bin/codesign";
}

View file

@ -15,7 +15,7 @@
darwin,
icu,
lndir,
substituteAll,
replaceVars,
nugetPackageHook,
xmlstarlet,
}:
@ -42,10 +42,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
[
./dotnet-setup-hook.sh
]
++ lib.optional (type == "sdk") (substituteAll {
src = ./dotnet-sdk-setup-hook.sh;
inherit lndir xmlstarlet;
});
++ lib.optional (type == "sdk") (
replaceVars ./dotnet-sdk-setup-hook.sh {
inherit lndir xmlstarlet;
}
);
propagatedSandboxProfile = toString unwrapped.__propagatedSandboxProfile;

View file

@ -10,7 +10,7 @@
llvmPackages,
symlinkJoin,
makeWrapper,
substituteAll,
replaceVars,
buildNpmPackage,
emscripten,
}:
@ -57,8 +57,7 @@ stdenv.mkDerivation rec {
];
patches = [
(substituteAll {
src = ./0001-emulate-clang-sysroot-include-logic.patch;
(replaceVars ./0001-emulate-clang-sysroot-include-logic.patch {
resourceDir = "${llvmEnv}/lib/clang/${lib.versions.major llvmPackages.llvm.version}/";
})
];

View file

@ -3,7 +3,7 @@
stdenv,
fetchurl,
tzdata,
substituteAll,
replaceVars,
iana-etc,
xcbuild,
mailcap,
@ -75,20 +75,17 @@ stdenv.mkDerivation (finalAttrs: {
'';
patches = [
(substituteAll {
src = ./iana-etc-1.17.patch;
(replaceVars ./iana-etc-1.17.patch {
iana = iana-etc;
})
# Patch the mimetype database location which is missing on NixOS.
# but also allow static binaries built with NixOS to run outside nix
(substituteAll {
src = ./mailcap-1.17.patch;
(replaceVars ./mailcap-1.17.patch {
inherit mailcap;
})
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
# that run outside a nix server
(substituteAll {
src = ./tzdata-1.19.patch;
(replaceVars ./tzdata-1.19.patch {
inherit tzdata;
})
./remove-tools-1.11.patch

View file

@ -3,7 +3,7 @@
stdenv,
fetchurl,
tzdata,
substituteAll,
replaceVars,
iana-etc,
xcbuild,
mailcap,
@ -75,20 +75,17 @@ stdenv.mkDerivation (finalAttrs: {
'';
patches = [
(substituteAll {
src = ./iana-etc-1.17.patch;
(replaceVars ./iana-etc-1.17.patch {
iana = iana-etc;
})
# Patch the mimetype database location which is missing on NixOS.
# but also allow static binaries built with NixOS to run outside nix
(substituteAll {
src = ./mailcap-1.17.patch;
(replaceVars ./mailcap-1.17.patch {
inherit mailcap;
})
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
# that run outside a nix server
(substituteAll {
src = ./tzdata-1.19.patch;
(replaceVars ./tzdata-1.19.patch {
inherit tzdata;
})
./remove-tools-1.11.patch

View file

@ -3,7 +3,7 @@
stdenv,
fetchurl,
tzdata,
substituteAll,
replaceVars,
iana-etc,
xcbuild,
mailcap,
@ -75,20 +75,17 @@ stdenv.mkDerivation (finalAttrs: {
'';
patches = [
(substituteAll {
src = ./iana-etc-1.17.patch;
(replaceVars ./iana-etc-1.17.patch {
iana = iana-etc;
})
# Patch the mimetype database location which is missing on NixOS.
# but also allow static binaries built with NixOS to run outside nix
(substituteAll {
src = ./mailcap-1.17.patch;
(replaceVars ./mailcap-1.17.patch {
inherit mailcap;
})
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
# that run outside a nix server
(substituteAll {
src = ./tzdata-1.19.patch;
(replaceVars ./tzdata-1.19.patch {
inherit tzdata;
})
./remove-tools-1.11.patch

View file

@ -13,7 +13,7 @@
python3,
# Not really used for anything real, just at build time.
git,
substituteAll,
replaceVars,
which,
z3,
cctools,
@ -67,8 +67,7 @@ stdenv.mkDerivation (rec {
./disable-networking-tests.patch
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
(substituteAll {
src = ./fix-darwin-build.patch;
(replaceVars ./fix-darwin-build.patch {
libSystem = darwin.Libsystem;
})
];

View file

@ -28,7 +28,7 @@
, glibc
, libuuid
# Darwin-specific
, substituteAll
, replaceVars
, fixDarwinDylibNames
, xcbuild
, cctools # libtool
@ -300,12 +300,10 @@ in stdenv.mkDerivation {
patch -p1 -d swift -i ${./patches/swift-linux-fix-libc-paths.patch}
patch -p1 -d swift -i ${./patches/swift-linux-fix-linking.patch}
patch -p1 -d swift -i ${./patches/swift-darwin-libcxx-flags.patch}
patch -p1 -d swift -i ${substituteAll {
src = ./patches/swift-darwin-plistbuddy-workaround.patch;
patch -p1 -d swift -i ${replaceVars ./patches/swift-darwin-plistbuddy-workaround.patch {
inherit swiftArch;
}}
patch -p1 -d swift -i ${substituteAll {
src = ./patches/swift-prevent-sdk-dirs-warning.patch;
patch -p1 -d swift -i ${replaceVars ./patches/swift-prevent-sdk-dirs-warning.patch {
inherit (builtins) storeDir;
}}

View file

@ -10,7 +10,7 @@
XCTest,
sqlite,
ncurses,
substituteAll,
replaceVars,
}:
let
sources = callPackage ../sources.nix { };
@ -50,8 +50,7 @@ stdenv.mkDerivation {
hash = "sha256-eVBaKN6uzj48ZnHtwGV0k5ChKjak1tDCyE+wTdyGq2c=";
})
# Prevent a warning about SDK directories we don't have.
(substituteAll {
src = ./patches/prevent-sdk-dirs-warnings.patch;
(replaceVars ./patches/prevent-sdk-dirs-warnings.patch {
inherit (builtins) storeDir;
})
];

View file

@ -13,7 +13,7 @@
pkg-config,
sqlite,
ncurses,
substituteAll,
replaceVars,
runCommandLocal,
makeWrapper,
DarwinTools, # sw_vers
@ -45,8 +45,7 @@ let
./patches/disable-xctest.patch
./patches/fix-clang-cxx.patch
./patches/nix-pkgconfig-vars.patch
(substituteAll {
src = ./patches/fix-stdlib-path.patch;
(replaceVars ./patches/fix-stdlib-path.patch {
inherit (builtins) storeDir;
swiftLib = swift.swift.lib;
})
@ -429,8 +428,7 @@ stdenv.mkDerivation (
# Prevent a warning about SDK directories we don't have.
swiftpmMakeMutable swift-driver
patch -p1 -d .build/checkouts/swift-driver -i ${
substituteAll {
src = ../swift-driver/patches/prevent-sdk-dirs-warnings.patch;
replaceVars ../swift-driver/patches/prevent-sdk-dirs-warnings.patch {
inherit (builtins) storeDir;
}
}

View file

@ -15,7 +15,7 @@
libintl,
libtool,
expat,
substituteAll,
replaceVars,
vala,
gobject-introspection,
}:
@ -45,8 +45,7 @@ let
pname = "vala";
inherit version;
setupHook = substituteAll {
src = ./setup-hook.sh;
setupHook = replaceVars ./setup-hook.sh {
apiVersion = lib.versions.majorMinor version;
};

View file

@ -6,7 +6,7 @@
installShellFiles,
git,
spdx-license-list-data,
substituteAll,
replaceVars,
}:
with python3Packages;
@ -29,12 +29,10 @@ buildPythonApplication rec {
];
patches = [
(substituteAll {
src = ./interpreter.patch;
(replaceVars ./interpreter.patch {
interpreter = (python3Packages.python.withPackages (_: propagatedBuildInputs)).interpreter;
})
(substituteAll {
src = ./use-local-spdx-license-list.patch;
(replaceVars ./use-local-spdx-license-list.patch {
spdx_license_list_data = spdx-license-list-data.json;
})
./missing-udev-rules-nixos.patch

View file

@ -1325,9 +1325,11 @@ self: super: builtins.intersectAttrs super {
# whatever graphviz is in PATH.
graphviz = overrideCabal (drv: {
patches = [
(pkgs.substituteAll {
src = ./patches/graphviz-hardcode-graphviz-store-path.patch;
(pkgs.replaceVars ./patches/graphviz-hardcode-graphviz-store-path.patch {
inherit (pkgs) graphviz;
# patch context
dot = null;
PATH = null;
})
] ++ (drv.patches or []);
}) super.graphviz;

View file

@ -6,7 +6,7 @@
fetchpatch,
runCommandLocal,
makeWrapper,
substituteAll,
replaceVars,
sbcl,
bash,
which,
@ -52,8 +52,7 @@ stdenv.mkDerivation rec {
libipasir = callPackage ./libipasirglucose4 { };
patches = [
(substituteAll {
src = ./0001-Fix-some-paths-for-Nix-build.patch;
(replaceVars ./0001-Fix-some-paths-for-Nix-build.patch {
libipasir = "${libipasir}/lib/${libipasir.libname}";
libssl = "${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}";
libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, substituteAll, fetchurl
{ lib, stdenv, replaceVars, fetchurl
, zlibSupport ? true, zlib
, bzip2, pkg-config, libffi
, sqlite, openssl, ncurses, python, expat, tcl, tk, tclPackages, libX11
@ -76,8 +76,7 @@ in with passthru; stdenv.mkDerivation rec {
patches = [
./dont_fetch_vendored_deps.patch
(substituteAll {
src = ./tk_tcl_paths.patch;
(replaceVars ./tk_tcl_paths.patch {
inherit tk tcl;
tk_dev = tk.dev;
tcl_dev = tcl;
@ -85,8 +84,7 @@ in with passthru; stdenv.mkDerivation rec {
tcl_libprefix = tcl.libPrefix;
})
(substituteAll {
src = ./sqlite_paths.patch;
(replaceVars ./sqlite_paths.patch {
inherit (sqlite) out dev;
})
];

View file

@ -1,6 +1,6 @@
{ lib
, stdenv
, substituteAll
, replaceVars
, fetchFromGitHub
, meson
, mesonEmulatorHook
@ -50,8 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
# Fix hardcoded paths
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
libstemmer_includedir = "${lib.getDev libstemmer}/include";
})

View file

@ -1,7 +1,7 @@
{
stdenv,
lib,
substituteAll,
replaceVars,
meson,
ninja,
pkg-config,
@ -18,8 +18,7 @@ stdenv.mkDerivation rec {
patches = [
# Allow building tools separately from the library.
# This is needed to break the depenency cycle.
(substituteAll {
src = ./standalone-tools.patch;
(replaceVars ./standalone-tools.patch {
inherit version;
})
];

View file

@ -2,7 +2,7 @@
, stdenv
, fetchurl
, fetchpatch
, substituteAll
, replaceVars
, meson
, ninja
, gettext
@ -127,8 +127,7 @@ stdenv.mkDerivation rec {
patches = [
# Add fallback paths for nvidia userspace libraries
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
inherit (addDriverRunpath) driverLink;
})
# Add support for newer AJA SDK from next GStreamer release

View file

@ -1,6 +1,6 @@
{ lib, stdenv
, fetchurl
, substituteAll
, replaceVars
, meson
, nasm
, ninja
@ -71,8 +71,7 @@ stdenv.mkDerivation rec {
# Reenable dynamic loading of libsoup on Darwin and use a different approach to do it.
./souploader-darwin.diff
# dlopen libsoup_3 with an absolute path
(substituteAll {
src = ./souploader.diff;
(replaceVars ./souploader.diff {
nixLibSoup3Path = "${lib.getLib libsoup_3}/lib";
})
];

View file

@ -22,7 +22,7 @@
pango,
perl,
pkg-config,
substituteAll,
replaceVars,
testers,
AppKit,
Cocoa,
@ -32,8 +32,7 @@
}:
let
gtkCleanImmodulesCache = substituteAll {
src = ./hooks/clean-immodules-cache.sh;
gtkCleanImmodulesCache = replaceVars ./hooks/clean-immodules-cache.sh {
gtk_module_path = "gtk-2.0";
gtk_binary_version = "2.10.0";
};

View file

@ -1,6 +1,6 @@
{ lib
, stdenv
, substituteAll
, replaceVars
, fetchurl
, pkg-config
, gettext
@ -53,8 +53,7 @@
let
gtkCleanImmodulesCache = substituteAll {
src = ./hooks/clean-immodules-cache.sh;
gtkCleanImmodulesCache = replaceVars ./hooks/clean-immodules-cache.sh {
gtk_module_path = "gtk-3.0";
gtk_binary_version = "3.0.0";
};

View file

@ -1,7 +1,7 @@
{ lib
, stdenv
, buildPackages
, substituteAll
, replaceVars
, fetchurl
, pkg-config
, docutils
@ -58,8 +58,7 @@
let
gtkCleanImmodulesCache = substituteAll {
src = ./hooks/clean-immodules-cache.sh;
gtkCleanImmodulesCache = replaceVars ./hooks/clean-immodules-cache.sh {
gtk_module_path = "gtk-4.0";
gtk_binary_version = "4.0.0";
};

View file

@ -3,7 +3,7 @@
stdenv,
fetchurl,
fetchpatch2,
substituteAll,
replaceVars,
libtool,
gettext,
zlib,
@ -60,8 +60,7 @@ stdenv.mkDerivation rec {
++ lib.optionals gstreamerSupport [
# Libraries cannot be wrapped so we need to hardcode the plug-in paths.
(substituteAll {
src = ./gst-hardcode-plugins.patch;
(replaceVars ./gst-hardcode-plugins.patch {
load_gst_plugins = lib.concatMapStrings (
plugin: ''gst_registry_scan_path(gst_registry_get(), "${lib.getLib plugin}/lib/gstreamer-1.0");''
) (gstPlugins gst_all_1);

View file

@ -3,7 +3,7 @@
, buildPackages
, fetchurl
, pkgsCross
, substituteAll
, replaceVars
, pkg-config
, gi-docgen
, gobject-introspection
@ -34,8 +34,7 @@ stdenv.mkDerivation rec {
patches = [
# Make PyGObjects gi library available.
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [
python3.pkgs.pygobject3
];

View file

@ -2,7 +2,7 @@
stdenv,
lib,
fetchurl,
substituteAll,
replaceVars,
meson,
ninja,
pkg-config,
@ -34,8 +34,7 @@ stdenv.mkDerivation rec {
patches = [
# Make PyGObjects gi library available.
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [
python3.pkgs.pygobject3
];

View file

@ -15,7 +15,7 @@
ninja,
pkg-config,
stdenv,
substituteAll,
replaceVars,
vala,
}:
@ -46,8 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
# Hardcode path to Settings schemas for GNOME & related desktops.
# Otherwise every app using libproxy would need to be wrapped individually.
(substituteAll {
src = ./hardcode-gsettings.patch;
(replaceVars ./hardcode-gsettings.patch {
gds = glib.getSchemaPath gsettings-desktop-schemas;
})
];

View file

@ -1,6 +1,6 @@
{
lib,
substituteAll,
replaceVars,
mkDerivation,
fetchFromGitHub,
gitUpdater,
@ -22,8 +22,7 @@ mkDerivation rec {
};
patches = [
(substituteAll {
src = ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch;
(replaceVars ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch {
mobileBroadbandProviderInfo = mobile-broadband-provider-info;
})
./0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch

View file

@ -2,7 +2,7 @@
lib,
stdenv,
fetchurl,
substituteAll,
replaceVars,
pname,
version,
url,
@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
patches = [
# Fix buidling on platforms other than x86
(substituteAll {
src = ./configure.patch;
(replaceVars ./configure.patch {
msse = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse";
})
];

View file

@ -32,7 +32,7 @@
, readline
, rpcsvc-proto
, stdenv
, substituteAll
, replaceVars
, xhtml1
, json_c
, writeScript
@ -127,8 +127,7 @@ stdenv.mkDerivation rec {
patches = [
./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
] ++ lib.optionals enableZfs [
(substituteAll {
src = ./0002-substitute-zfs-and-zpool-commands.patch;
(replaceVars ./0002-substitute-zfs-and-zpool-commands.patch {
zfs = "${zfs}/bin/zfs";
zpool = "${zfs}/bin/zpool";
})

View file

@ -11,7 +11,7 @@
gtk3,
qtbase,
qtwayland,
substituteAll,
replaceVars,
gsettings-desktop-schemas,
useQt6 ? false,
}:
@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
patches = [
# Hardcode GSettings schema path to avoid crashes from missing schemas
(substituteAll {
src = ./hardcode-gsettings.patch;
(replaceVars ./hardcode-gsettings.patch {
gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas;
})

View file

@ -4,7 +4,7 @@
lib,
qtbase,
qtdeclarative,
substituteAll,
replaceVars,
llvmPackages,
}:
@ -29,13 +29,11 @@ qtModule {
patches = [
# fixQtBuiltinPaths overwrites builtin paths we should keep
(substituteAll {
src = ./qttools-QT_HOST_DATA-refs.patch;
(replaceVars ./qttools-QT_HOST_DATA-refs.patch {
qtbaseDev = lib.getDev qtbase;
})
(substituteAll {
src = ./qttools-libclang-main-header.patch;
(replaceVars ./qttools-libclang-main-header.patch {
libclangDev = lib.getDev llvmPackages.libclang;
})
];

View file

@ -7,7 +7,7 @@
eigen,
ensureNewerSourcesForZipFilesHook,
fetchFromGitHub,
substituteAll,
replaceVars,
glpk,
lib,
pkg-config,
@ -40,8 +40,7 @@ stdenv.mkDerivation rec {
};
patches = [
(substituteAll {
src = ./offline.patch;
(replaceVars ./offline.patch {
pybind11_protobuf = "../../pybind11_protobuf";
})
];

View file

@ -2,7 +2,7 @@
stdenv,
lib,
fetchFromGitLab,
substituteAll,
replaceVars,
meson,
pkg-config,
qttools,
@ -25,8 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
# qmake get qtbase's path, but wayqt need qtwayland
(substituteAll {
src = ./fix-qtwayland-header-path.diff;
(replaceVars ./fix-qtwayland-header-path.diff {
qtWaylandPath = "${qtwayland}/include";
})
];

View file

@ -65,7 +65,7 @@
libbacktrace,
systemd,
xdg-dbus-proxy,
substituteAll,
replaceVars,
glib,
unifdef,
addDriverRunpath,
@ -103,8 +103,7 @@ clangStdenv.mkDerivation (finalAttrs: {
};
patches = lib.optionals clangStdenv.hostPlatform.isLinux [
(substituteAll {
src = ./fix-bubblewrap-paths.patch;
(replaceVars ./fix-bubblewrap-paths.patch {
inherit (builtins) storeDir;
inherit (addDriverRunpath) driverLink;
})

View file

@ -59,7 +59,7 @@ let
;
inherit (pkgs)
substituteAll
replaceVars
;
# Stolen from python-packages.nix
@ -209,8 +209,7 @@ let
;
};
buildScript = substituteAll {
src = ./builder.lisp;
buildScript = replaceVars ./builder.lisp {
asdf = "${asdfFasl}/asdf.${faslExt}";
};

View file

@ -5,7 +5,7 @@
lua,
pkg-config,
lib,
substituteAll,
replaceVars,
zenity,
AppKit,
}:
@ -24,8 +24,7 @@ buildLuarocksPackage {
# use zenity because default gtk impl just crashes
patches = [
(substituteAll {
src = ./zenity.patch;
(replaceVars ./zenity.patch {
inherit zenity;
})
];

View file

@ -27,7 +27,7 @@
cmdliner,
hxd,
getconf,
substituteAll,
replaceVars,
}:
buildDunePackage rec {
@ -42,8 +42,7 @@ buildDunePackage rec {
};
patches = [
(substituteAll {
src = ./carton-find-getconf.patch;
(replaceVars ./carton-find-getconf.patch {
getconf = "${getconf}";
})
];

View file

@ -1,6 +1,6 @@
{
buildDunePackage,
substituteAll,
replaceVars,
ocaml,
menhirLib,
menhirSdk,
@ -19,8 +19,7 @@ buildDunePackage rec {
];
patches = [
(substituteAll {
src = ./menhir-suggest-menhirLib.patch;
(replaceVars ./menhir-suggest-menhirLib.patch {
libdir = "${menhirLib}/lib/ocaml/${ocaml.version}/site-lib/menhirLib";
})
];

View file

@ -1,7 +1,7 @@
{
lib,
buildDunePackage,
substituteAll,
replaceVars,
base64,
cmdliner,
digestif,
@ -24,8 +24,7 @@ buildDunePackage rec {
minimalOCamlVersion = "4.09";
patches = [
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
inherit coreutils imagemagick;
})
];

View file

@ -4,7 +4,7 @@
fetchFromGitHub,
libcouchbase,
zlib,
substituteAll,
replaceVars,
php,
}:
let
@ -29,8 +29,7 @@ buildPecl {
];
patches = [
(substituteAll {
src = ./libcouchbase.patch;
(replaceVars ./libcouchbase.patch {
inherit libcouchbase;
})
];

View file

@ -4,7 +4,7 @@
buildPythonPackage,
fetchFromGitHub,
fetchpatch2,
substituteAll,
replaceVars,
isPy310,
isPyPy,
@ -57,8 +57,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./unvendor-llhttp.patch;
(replaceVars ./unvendor-llhttp.patch {
llhttpDev = lib.getDev llhttp;
llhttpLib = lib.getLib llhttp;
})

View file

@ -8,7 +8,7 @@
pytest7CheckHook,
pythonOlder,
six,
substituteAll,
replaceVars,
withGraphviz ? true,
}:
@ -27,8 +27,7 @@ buildPythonPackage rec {
};
patches = lib.optionals withGraphviz [
(substituteAll {
src = ./graphviz.patch;
(replaceVars ./graphviz.patch {
inherit graphviz;
})
];

View file

@ -4,7 +4,7 @@
buildPythonPackage,
fetchPypi,
pythonOlder,
substituteAll,
replaceVars,
hatchling,
}:
@ -20,9 +20,8 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
(replaceVars ./remove-hatch-plugins.patch {
# hatch-vcs and hatch-fancy-pypi-readme depend on pytest, which depends on attrs
src = ./remove-hatch-plugins.patch;
inherit version;
})
];

View file

@ -8,7 +8,7 @@
python,
pexpect,
bashInteractive,
substituteAll,
replaceVars,
}:
buildPythonPackage rec {
@ -23,8 +23,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./bash-path.patch;
(replaceVars ./bash-path.patch {
bash = lib.getExe bashInteractive;
})
];

View file

@ -4,7 +4,7 @@
fetchPypi,
fetchFromGitHub,
pythonOlder,
substituteAll,
replaceVars,
colorama,
contourpy,
jinja2,
@ -64,8 +64,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./hardcode-nodejs-npmjs-paths.patch;
(replaceVars ./hardcode-nodejs-npmjs-paths.patch {
node_bin = "${nodejs}/bin/node";
npm_bin = "${nodejs}/bin/npm";
})

View file

@ -5,7 +5,7 @@
pythonOlder,
fetchPypi,
lib,
substituteAll,
replaceVars,
pikepdf,
pytestCheckHook,
cairo,
@ -32,8 +32,7 @@ buildPythonPackage rec {
patches = [
# OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0
(substituteAll {
src = ./dlopen-paths.patch;
(replaceVars ./dlopen-paths.patch {
ext = stdenv.hostPlatform.extensions.sharedLibrary;
cairo = cairo.out;
glib = glib.out;

View file

@ -2,7 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
substituteAll,
replaceVars,
cmdstan,
setuptools,
pandas,
@ -27,8 +27,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./use-nix-cmdstan-path.patch;
(replaceVars ./use-nix-cmdstan-path.patch {
cmdstan = "${cmdstan}/opt/cmdstan";
})
];

View file

@ -5,7 +5,7 @@
pythonOlder,
pythonAtLeast,
fetchFromGitHub,
substituteAll,
replaceVars,
gdb,
lldb,
pytestCheckHook,
@ -39,8 +39,7 @@ buildPythonPackage rec {
patches =
[
# Use nixpkgs version instead of versioneer
(substituteAll {
src = ./hardcode-version.patch;
(replaceVars ./hardcode-version.patch {
inherit version;
})
@ -62,15 +61,13 @@ buildPythonPackage rec {
]
++ lib.optionals stdenv.hostPlatform.isLinux [
# Hard code GDB path (used to attach to process)
(substituteAll {
src = ./hardcode-gdb.patch;
(replaceVars ./hardcode-gdb.patch {
inherit gdb;
})
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Hard code LLDB path (used to attach to process)
(substituteAll {
src = ./hardcode-lldb.patch;
(replaceVars ./hardcode-lldb.patch {
inherit lldb;
})
];

View file

@ -4,7 +4,7 @@
buildPythonPackage,
deltachat-rpc-server,
setuptools-scm,
substituteAll,
replaceVars,
}:
buildPythonPackage rec {
@ -20,8 +20,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./paths.patch;
(replaceVars ./paths.patch {
deltachatrpcserver = lib.getExe deltachat-rpc-server;
})
];

View file

@ -3,7 +3,7 @@
stdenv,
buildPythonPackage,
fetchPypi,
substituteAll,
replaceVars,
geos_3_9,
gdal,
asgiref,
@ -28,17 +28,17 @@ buildPythonPackage rec {
patches =
[
(substituteAll {
src = ./django_3_set_zoneinfo_dir.patch;
(replaceVars ./django_3_set_zoneinfo_dir.patch {
zoneinfo = tzdata + "/share/zoneinfo";
})
]
++ lib.optional withGdal (substituteAll {
src = ./django_3_set_geos_gdal_lib.patch;
inherit geos_3_9;
inherit gdal;
extension = stdenv.hostPlatform.extensions.sharedLibrary;
});
++ lib.optional withGdal (
replaceVars ./django_3_set_geos_gdal_lib.patch {
inherit geos_3_9;
inherit gdal;
extension = stdenv.hostPlatform.extensions.sharedLibrary;
}
);
propagatedBuildInputs = [
asgiref

View file

@ -6,7 +6,7 @@
fetchpatch,
pythonAtLeast,
pythonOlder,
substituteAll,
replaceVars,
# build
setuptools,
@ -59,8 +59,7 @@ buildPythonPackage rec {
patches =
[
(substituteAll {
src = ./django_4_set_zoneinfo_dir.patch;
(replaceVars ./django_4_set_zoneinfo_dir.patch {
zoneinfo = tzdata + "/share/zoneinfo";
})
# make sure the tests don't remove packages from our pythonpath
@ -75,8 +74,7 @@ buildPythonPackage rec {
})
]
++ lib.optionals withGdal [
(substituteAll {
src = ./django_4_set_geos_gdal_lib.patch;
(replaceVars ./django_4_set_geos_gdal_lib.patch {
geos = geos;
gdal = gdal;
extension = stdenv.hostPlatform.extensions.sharedLibrary;

View file

@ -5,7 +5,7 @@
fetchFromGitHub,
fetchpatch,
pythonOlder,
substituteAll,
replaceVars,
# build-system
setuptools,
@ -58,8 +58,7 @@ buildPythonPackage rec {
patches =
[
(substituteAll {
src = ./django_5_set_zoneinfo_dir.patch;
(replaceVars ./django_5_set_zoneinfo_dir.patch {
zoneinfo = tzdata + "/share/zoneinfo";
})
# prevent tests from messing with our pythonpath
@ -75,8 +74,7 @@ buildPythonPackage rec {
})
]
++ lib.optionals withGdal [
(substituteAll {
src = ./django_5_set_geos_gdal_lib.patch;
(replaceVars ./django_5_set_geos_gdal_lib.patch {
geos = geos;
gdal = gdal;
extension = stdenv.hostPlatform.extensions.sharedLibrary;

View file

@ -2,7 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
substituteAll,
replaceVars,
pyparsing,
graphviz,
pytestCheckHook,
@ -20,8 +20,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./path.patch;
(replaceVars ./path.patch {
inherit graphviz;
})
./test.patch # https://github.com/kjellmf/dot2tex/issues/5

View file

@ -2,7 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
substituteAll,
replaceVars,
espeak-ng,
pytestCheckHook,
}:
@ -20,8 +20,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./cdll.patch;
(replaceVars ./cdll.patch {
libespeak_ng = "${lib.getLib espeak-ng}/lib/libespeak-ng.so";
})
];

View file

@ -2,7 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
substituteAll,
replaceVars,
# build-system
flit-scm,
@ -30,8 +30,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./msgfmt-path.patch;
(replaceVars ./msgfmt-path.patch {
msgfmt = lib.getExe' gettext "msgfmt";
})
];

View file

@ -3,7 +3,9 @@
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
substituteAll,
replaceVars,
# build
pkg-config,
glibc,
python,
@ -31,8 +33,7 @@ buildPythonPackage rec {
url = "https://github.com/oscaracena/pygattlib/commit/73a73b71cfc139e1e0a08816fb976ff330c77ea5.patch";
hash = "sha256-/Y/CZNdN/jcxWroqRfdCH2rPUxZUbug668MIAow0scs=";
})
(substituteAll {
src = ./setup.patch;
(replaceVars ./setup.patch {
boost_version =
let
pythonVersion = with lib.versions; "${major python.version}${minor python.version}";

View file

@ -10,7 +10,7 @@
pytestCheckHook,
pythonOlder,
setuptools,
substituteAll,
replaceVars,
util-linux,
}:
@ -42,8 +42,7 @@ buildPythonPackage rec {
url = "https://github.com/alpernebbi/git-annex-adapter/commit/d0d8905965a3659ce95cbd8f8b1e8598f0faf76b.patch";
hash = "sha256-UcRTKzD3sbXGIuxj4JzZDnvjTYyWVkfeWgKiZ1rAlus=";
})
(substituteAll {
src = ./git-annex-path.patch;
(replaceVars ./git-annex-path.patch {
gitAnnex = "${git-annex}/bin/git-annex";
})
];

View file

@ -13,7 +13,7 @@
pythonOlder,
scikit-image,
setuptools,
substituteAll,
replaceVars,
}:
buildPythonPackage rec {
@ -37,8 +37,7 @@ buildPythonPackage rec {
url = "https://github.com/quintusdias/glymur/commit/89b159299035ebb05776c3b90278f410ca6dba64.patch";
hash = "sha256-C/Q5WZmW5YtN3U8fxKljfqwKHtFLfR2LQ69Tj8SuIWg=";
})
(substituteAll {
src = ./set-lib-paths.patch;
(replaceVars ./set-lib-paths.patch {
openjp2_lib = "${lib.getLib openjpeg}/lib/libopenjp2${stdenv.hostPlatform.extensions.sharedLibrary}";
tiff_lib = "${lib.getLib libtiff}/lib/libtiff${stdenv.hostPlatform.extensions.sharedLibrary}";
})

View file

@ -3,7 +3,7 @@
config,
buildPythonPackage,
fetchFromGitHub,
substituteAll,
replaceVars,
addDriverRunpath,
cudaSupport ? config.cudaSupport,
rocmSupport ? config.rocmSupport,
@ -33,8 +33,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./0001-fix-dlopen-cuda.patch;
(replaceVars ./0001-fix-dlopen-cuda.patch {
inherit (addDriverRunpath) driverLink;
libnvrtc =
if cudaSupport then

View file

@ -4,7 +4,7 @@
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
substituteAll,
replaceVars,
graphviz-nox,
xdg-utils,
makeFontsConf,
@ -32,8 +32,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./paths.patch;
(replaceVars ./paths.patch {
graphviz = graphviz-nox;
xdgutils = xdg-utils;
})

View file

@ -11,7 +11,7 @@
packaging,
pytestCheckHook,
pythonOlder,
substituteAll,
replaceVars,
}:
buildPythonPackage rec {
@ -29,8 +29,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./antlr4.patch;
(replaceVars ./antlr4.patch {
antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar";
})
# https://github.com/facebookresearch/hydra/pull/2731

View file

@ -2,7 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
substituteAll,
replaceVars,
ffmpeg,
# build-system
@ -27,8 +27,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./ffmpeg-path.patch;
(replaceVars ./ffmpeg-path.patch {
ffmpeg = lib.getExe ffmpeg;
})
];

View file

@ -4,7 +4,7 @@
buildPythonPackage,
fetchFromGitHub,
isPyPy,
substituteAll,
replaceVars,
# build-system
setuptools,
@ -42,8 +42,7 @@ buildPythonPackage rec {
};
patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [
(substituteAll {
src = ./libgl-path.patch;
(replaceVars ./libgl-path.patch {
libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}";
})
];

View file

@ -3,7 +3,7 @@
buildPythonPackage,
isPy27,
fetchFromGitea,
substituteAll,
replaceVars,
fetchpatch,
colord,
setuptools,
@ -38,8 +38,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./default-icc-profile.patch;
(replaceVars ./default-icc-profile.patch {
srgbProfile =
if stdenv.hostPlatform.isDarwin then
"/System/Library/ColorSync/Profiles/sRGB Profile.icc"

View file

@ -1,7 +1,7 @@
{
lib,
buildPythonPackage,
substituteAll,
replaceVars,
fetchPypi,
hatchling,
}:
@ -20,8 +20,7 @@ buildPythonPackage rec {
patches = [
# Cannot use hatch-vcs, due to an inifinite recursion
(substituteAll {
src = ./version.patch;
(replaceVars ./version.patch {
inherit version;
})
];

View file

@ -2,7 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
substituteAll,
replaceVars,
# build-system
setuptools,
@ -29,8 +29,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./version.patch;
(replaceVars ./version.patch {
inherit version;
})
];

View file

@ -6,7 +6,7 @@
krb5-c,
pythonOlder,
setuptools,
substituteAll,
replaceVars,
}:
buildPythonPackage rec {
@ -22,8 +22,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
inherit findutils;
krb5 = krb5-c;
# krb5-config is in dev output

View file

@ -10,7 +10,7 @@
numpy,
cffi,
openfst,
substituteAll,
replaceVars,
callPackage,
}:
@ -43,8 +43,7 @@ buildPythonPackage rec {
# Uses the dependencies' binaries from $PATH instead of a specific directory
./0002-exec-path.patch
# Makes it dynamically link to the correct Kaldi library
(substituteAll {
src = ./0003-ffi-path.patch;
(replaceVars ./0003-ffi-path.patch {
kaldiFork = "${kaldi}/lib";
})
];

View file

@ -6,7 +6,7 @@
rustPlatform,
cmake,
nasm,
substituteAll,
replaceVars,
libiconv,
}:
@ -36,8 +36,7 @@ buildPythonPackage rec {
# The path dependency doesn't vendor the dependencies correctly, so get kornia-rs from crates instead.
patches = [
(substituteAll {
src = ./kornia-rs-from-crates.patch;
(replaceVars ./kornia-rs-from-crates.patch {
inherit version;
})
];

View file

@ -3,7 +3,7 @@
buildPythonPackage,
isPy27,
fetchPypi,
substituteAll,
replaceVars,
pkgs,
pytestCheckHook,
}:
@ -20,8 +20,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
libevdev = lib.getLib pkgs.libevdev;
})
];

Some files were not shown because too many files have changed in this diff Show more