mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
treewide: replace substituteAll with replaceVars (part 3)
Driving #237216 forward.
This commit is contained in:
Wolfgang Walther
parent
3ab4abae1d
commit
b12e9707e0
51 changed files with 110 additions and 169 deletions
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
pkg-config,
|
||||
glib,
|
||||
shadow,
|
||||
|
|
@ -36,8 +36,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
# Hardcode dependency paths.
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
inherit shadow coreutils;
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
autoAddDriverRunpath,
|
||||
|
|
@ -59,8 +59,7 @@ rustPlatform.buildRustPackage rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-finding-libs.patch;
|
||||
(replaceVars ./fix-finding-libs.patch {
|
||||
ffmpeg = lib.getDev ffmpeg;
|
||||
x264 = lib.getDev x264;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
docbook_xml_dtd_42,
|
||||
docbook_xsl,
|
||||
fontconfig,
|
||||
|
|
@ -74,8 +74,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./paths.patch;
|
||||
(replaceVars ./paths.patch {
|
||||
pngquant = "${pngquant}/bin/pngquant";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
binutils,
|
||||
asciidoctor,
|
||||
cmake,
|
||||
|
|
@ -54,8 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# Darwin.
|
||||
# Additionally, when cross compiling, the correct target prefix
|
||||
# needs to be set.
|
||||
(substituteAll {
|
||||
src = ./fix-objdump-path.patch;
|
||||
(replaceVars ./fix-objdump-path.patch {
|
||||
objdump = "${binutils.bintools}/bin/${binutils.targetPrefix}objdump";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, substituteAll
|
||||
, replaceVars
|
||||
, buildPackages
|
||||
, bzip2
|
||||
, curlMinimal
|
||||
|
|
@ -75,8 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ lib.optional stdenv.hostPlatform.isDarwin ./006-darwin-always-set-runtime-c-flag.diff
|
||||
# On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path.
|
||||
++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) (
|
||||
substituteAll {
|
||||
src = ./007-darwin-bsd-ps-abspath.diff;
|
||||
replaceVars ./007-darwin-bsd-ps-abspath.diff {
|
||||
ps = lib.getExe ps;
|
||||
})
|
||||
++ [
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
python3,
|
||||
shared-mime-info,
|
||||
socat,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
systemd,
|
||||
testers,
|
||||
valgrind,
|
||||
|
|
@ -84,8 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
patches = [
|
||||
# Hardcode paths used by tests and change test runtime generation to use files from Nix store.
|
||||
# https://github.com/flatpak/flatpak/issues/1460
|
||||
(substituteAll {
|
||||
src = ./fix-test-paths.patch;
|
||||
(replaceVars ./fix-test-paths.patch {
|
||||
inherit
|
||||
coreutils
|
||||
gettext
|
||||
|
|
@ -98,8 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
})
|
||||
|
||||
# Hardcode paths used by Flatpak itself.
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
p11kit = "${p11-kit.bin}/bin/p11-kit";
|
||||
})
|
||||
|
||||
|
|
@ -235,8 +233,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
|
||||
passthru = {
|
||||
icon-validator-patch = substituteAll {
|
||||
src = ./fix-icon-validation.patch;
|
||||
icon-validator-patch = replaceVars ./fix-icon-validation.patch {
|
||||
inherit (builtins) storeDir;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
pkg-config,
|
||||
pantheon,
|
||||
python3,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
glib,
|
||||
gtk3,
|
||||
dosfstools,
|
||||
|
|
@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
ext4 = "${e2fsprogs}/bin/mkfs.ext4";
|
||||
exfat = "${exfat}/bin/mkfs.exfat";
|
||||
fat = "${dosfstools}/bin/mkfs.fat";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
|
|
@ -35,8 +35,7 @@
|
|||
|
||||
let
|
||||
|
||||
override = substituteAll {
|
||||
src = ./org.gnome.login-screen.gschema.override;
|
||||
override = replaceVars ./org.gnome.login-screen.gschema.override {
|
||||
icon = "${nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake-white.svg";
|
||||
};
|
||||
|
||||
|
|
@ -105,8 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
})
|
||||
|
||||
# Change hardcoded paths to nix store paths.
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
inherit
|
||||
coreutils
|
||||
plymouth
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
meson,
|
||||
ninja,
|
||||
nixosTests,
|
||||
|
|
@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./hardcode-gsettings.patch;
|
||||
(replaceVars ./hardcode-gsettings.patch {
|
||||
gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas;
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
accountsservice,
|
||||
adwaita-icon-theme,
|
||||
colord,
|
||||
|
|
@ -82,8 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./paths.patch;
|
||||
(replaceVars ./paths.patch {
|
||||
gcm = gnome-color-manager;
|
||||
inherit glibc tzdata shadow;
|
||||
inherit cups networkmanagerapplet;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
pkg-config,
|
||||
libxslt,
|
||||
ninja,
|
||||
|
|
@ -44,8 +44,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
(substituteAll {
|
||||
src = ./bubblewrap-paths.patch;
|
||||
(replaceVars ./bubblewrap-paths.patch {
|
||||
bubblewrap_bin = "${bubblewrap}/bin/bwrap";
|
||||
inherit (builtins) storeDir;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
dconf,
|
||||
gettext,
|
||||
meson,
|
||||
|
|
@ -45,8 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./0001-fix-paths.patch;
|
||||
(replaceVars ./0001-fix-paths.patch {
|
||||
inherit tzdata;
|
||||
tecla = gnome-tecla;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
|
|
@ -36,8 +36,7 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
# Our glib setup hooks moves GSettings schemas to a subdirectory to prevent conflicts.
|
||||
# We need to patch the build script so that the extension can find them.
|
||||
(substituteAll {
|
||||
src = ./fix-schema-path.patch;
|
||||
(replaceVars ./fix-schema-path.patch {
|
||||
inherit pname version;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
|
|
@ -47,8 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
gsettings = "${glib.bin}/bin/gsettings";
|
||||
dbusLaunch = "${dbus.lib}/bin/dbus-launch";
|
||||
bash = "${bash}/bin/bash";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
buildPackages,
|
||||
fetchurl,
|
||||
meson,
|
||||
|
|
@ -54,8 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202
|
||||
./add-gnome-session-ctl-option.patch
|
||||
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
inherit tzdata;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
fetchurl,
|
||||
meson,
|
||||
ninja,
|
||||
|
|
@ -51,8 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202
|
||||
./add-gnome-session-ctl-option.patch
|
||||
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
inherit tzdata;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
glib,
|
||||
gnome,
|
||||
gnome-menus,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -23,12 +23,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix_gmenu.patch;
|
||||
(replaceVars ./fix_gmenu.patch {
|
||||
gmenu_path = "${gnome-menus}/lib/girepository-1.0";
|
||||
})
|
||||
(substituteAll {
|
||||
src = ./fix_gtop.patch;
|
||||
(replaceVars ./fix_gtop.patch {
|
||||
gtop_path = "${libgtop}/lib/girepository-1.0";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
lib,
|
||||
stdenv,
|
||||
docutils,
|
||||
|
|
@ -84,8 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
patches = [
|
||||
# Hardcode paths to various dependencies so that they can be found at runtime.
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
glib_compile_schemas = "${glib.dev}/bin/glib-compile-schemas";
|
||||
gsettings = "${glib.bin}/bin/gsettings";
|
||||
tecla = "${lib.getBin gnome-tecla}/bin/tecla";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
pkg-config,
|
||||
meson,
|
||||
ninja,
|
||||
|
|
@ -56,8 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
inherit isocodes;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
c-ares,
|
||||
cmake,
|
||||
crc32c,
|
||||
|
|
@ -43,8 +43,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./hardcode-googleapis-path.patch;
|
||||
(replaceVars ./hardcode-googleapis-path.patch {
|
||||
url = googleapis;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
util-linux,
|
||||
polkit,
|
||||
wrapGAppsHook3,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
mtools,
|
||||
dosfstools,
|
||||
xhost,
|
||||
|
|
@ -39,8 +39,7 @@ stdenv.mkDerivation rec {
|
|||
# however the binary won't be suid so it returns
|
||||
# an error preventing the program from detection
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./polkit.patch;
|
||||
(replaceVars ./polkit.patch {
|
||||
polkit_version = polkit.version;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
|
|
@ -46,8 +46,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-python-path.patch;
|
||||
(replaceVars ./fix-python-path.patch {
|
||||
python = "${pythonEnv}/bin/python3";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
gettext,
|
||||
dbus,
|
||||
glib,
|
||||
|
|
@ -55,8 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./hardcode-ssh-path.patch;
|
||||
(replaceVars ./hardcode-ssh-path.patch {
|
||||
ssh_program = "${lib.getBin openssh}/bin/ssh";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
scdoc,
|
||||
tzdata,
|
||||
mailcap,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
callPackage,
|
||||
enableCrossCompilation ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit),
|
||||
pkgsCross,
|
||||
|
|
@ -92,22 +92,19 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
patches = [
|
||||
# Replace FHS paths with nix store
|
||||
(substituteAll {
|
||||
src = ./001-tzdata.patch;
|
||||
(replaceVars ./001-tzdata.patch {
|
||||
inherit tzdata;
|
||||
})
|
||||
# Don't build haredoc since it uses the build `hare` bin, which breaks
|
||||
# cross-compilation.
|
||||
./002-dont-build-haredoc.patch
|
||||
# Hardcode harec and qbe.
|
||||
(substituteAll {
|
||||
src = ./003-hardcode-qbe-and-harec.patch;
|
||||
(replaceVars ./003-hardcode-qbe-and-harec.patch {
|
||||
harec_bin = lib.getExe harec;
|
||||
qbe_bin = lib.getExe qbe;
|
||||
})
|
||||
# Use mailcap `/etc/mime.types` for Hare's mime module
|
||||
(substituteAll {
|
||||
src = ./004-use-mailcap-for-mimetypes.patch;
|
||||
(replaceVars ./004-use-mailcap-for-mimetypes.patch {
|
||||
inherit mailcap;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
nix-update-script,
|
||||
makeWrapper,
|
||||
bash,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "haredo";
|
||||
|
|
@ -27,8 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
patches = [
|
||||
# Use nix store's bash instead of sh. `@bash@/bin/sh` is used, since haredo expects a posix shell.
|
||||
(substituteAll {
|
||||
src = ./001-use-nix-store-sh.patch;
|
||||
(replaceVars ./001-use-nix-store-sh.patch {
|
||||
inherit bash;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, tzdata, fetchpatch, substituteAll }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, tzdata, fetchpatch, replaceVars }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "howard-hinnant-date";
|
||||
|
|
@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
|
|||
# Without this patch, this library will drop a `tzdata` directory into
|
||||
# `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it
|
||||
# searches for `zoneinfo` be the one from the `tzdata` package.
|
||||
(substituteAll {
|
||||
src = ./make-zoneinfo-available.diff;
|
||||
(replaceVars ./make-zoneinfo-available.diff {
|
||||
inherit tzdata;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
symlinkJoin,
|
||||
cmake,
|
||||
doxygen,
|
||||
|
|
@ -24,9 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
patches = lib.optionals finalAttrs.finalPackage.doCheck [
|
||||
(substituteAll {
|
||||
(replaceVars ./remove-fetchcontent-usage.patch {
|
||||
# Do not let cmake's fetchContent download unity
|
||||
src = ./remove-fetchcontent-usage.patch;
|
||||
unitySrc = symlinkJoin {
|
||||
name = "unity-with-iniparser-config";
|
||||
paths = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
fetchurl,
|
||||
stdenv,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
vim,
|
||||
sendmailPath ? "/usr/sbin/sendmail",
|
||||
}:
|
||||
|
|
@ -17,8 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./0000-nixpkgs-specific.diff;
|
||||
(replaceVars ./0000-nixpkgs-specific.diff {
|
||||
inherit sendmailPath;
|
||||
viPath = lib.getExe' vim "vim";
|
||||
defPath = lib.concatStringsSep ":" [
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
ocl-icd,
|
||||
# include non-free ClamAV unrar code
|
||||
enableUnfree ? false,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
|
|
@ -35,8 +35,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = lib.optionals withOpenCL [
|
||||
(substituteAll {
|
||||
src = ./opencl.patch;
|
||||
(replaceVars ./opencl.patch {
|
||||
ocl_icd = ocl-icd;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
mono,
|
||||
makeWrapper,
|
||||
icoutils,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
xsel,
|
||||
xorg,
|
||||
xdotool,
|
||||
|
|
@ -37,8 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
buildInputs = [ icoutils ];
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
xsel = "${xsel}/bin/xsel";
|
||||
xprop = "${xorg.xprop}/bin/xprop";
|
||||
xdotool = "${xdotool}/bin/xdotool";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
|
|
@ -20,8 +20,7 @@ rustPlatform.buildRustPackage rec {
|
|||
cargoHash = "sha256-zkPLas+fQQzm7LlWNpTooUR/e30KMS9OET6PMwQ2yAA=";
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./use-correct-binary-path-in-tests.patch;
|
||||
(replaceVars ./use-correct-binary-path-in-tests.patch {
|
||||
target_triple = stdenv.hostPlatform.rust.rustcTarget;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
perl,
|
||||
hwdata,
|
||||
osinfo-db,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
vala ? null,
|
||||
}:
|
||||
|
||||
|
|
@ -61,8 +61,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./osinfo-db-data-dir.patch;
|
||||
(replaceVars ./osinfo-db-data-dir.patch {
|
||||
osinfo_db_data_dir = "${osinfo-db}/share";
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
libstartup_notification,
|
||||
libxml2,
|
||||
pkg-config,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
wrapGAppsHook3,
|
||||
zenity,
|
||||
}:
|
||||
|
|
@ -28,8 +28,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
inherit zenity;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
libnotify,
|
||||
python3Packages,
|
||||
steam-run,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
unzip,
|
||||
webkitgtk_4_0,
|
||||
wrapGAppsHook3,
|
||||
|
|
@ -26,8 +26,7 @@ python3Packages.buildPythonApplication rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./inject-launcher-steam-run.diff;
|
||||
(replaceVars ./inject-launcher-steam-run.diff {
|
||||
steamrun = lib.getExe steam-run;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
installShellFiles,
|
||||
makeWrapper,
|
||||
nodejs,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
v4l-utils,
|
||||
which,
|
||||
}:
|
||||
|
|
@ -46,8 +46,7 @@ buildNpmPackage rec {
|
|||
nodejs
|
||||
which
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [ v4l-utils ];
|
||||
crc32Patch = substituteAll {
|
||||
src = ./fix-musl-detection.patch;
|
||||
crc32Patch = replaceVars ./fix-musl-detection.patch {
|
||||
isMusl = if stdenv.hostPlatform.isMusl then "true" else "false";
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
cairo,
|
||||
cinnamon-desktop,
|
||||
dbus,
|
||||
|
|
@ -58,8 +58,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
inherit zenity;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
fetchFromGitHub,
|
||||
ffmpeg-headless,
|
||||
nixosTests,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
providers ? [ ],
|
||||
}:
|
||||
|
||||
|
|
@ -38,8 +38,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./ffmpeg.patch;
|
||||
(replaceVars ./ffmpeg.patch {
|
||||
ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg";
|
||||
ffprobe = "${lib.getBin ffmpeg-headless}/bin/ffprobe";
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
fetchurl,
|
||||
meson,
|
||||
ninja,
|
||||
|
|
@ -32,8 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
patches = [
|
||||
# Make PyGObject’s gi library available.
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [
|
||||
python3.pkgs.pygobject3
|
||||
];
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
net-snmp,
|
||||
openssl,
|
||||
pkg-config,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
systemd,
|
||||
udev,
|
||||
gnused,
|
||||
|
|
@ -40,8 +40,7 @@ stdenv.mkDerivation rec {
|
|||
# trying to install directly into /etc/nut which predictably fails
|
||||
./nutshutdown-conf-default.patch
|
||||
|
||||
(substituteAll {
|
||||
src = ./hardcode-paths.patch;
|
||||
(replaceVars ./hardcode-paths.patch {
|
||||
avahi = "${avahi}/lib";
|
||||
freeipmi = "${freeipmi}/lib";
|
||||
libgpiod = "${libgpiod_1}/lib";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
fetchFromGitHub,
|
||||
fetchPypi,
|
||||
python3,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
# To include additional plugins, pass them here as an overlay.
|
||||
|
|
@ -194,14 +194,12 @@ let
|
|||
|
||||
patches = [
|
||||
# substitute pip and let it find out, that it can't write anywhere
|
||||
(substituteAll {
|
||||
src = ./pip-path.patch;
|
||||
(replaceVars ./pip-path.patch {
|
||||
pip = "${self.pip}/bin/pip";
|
||||
})
|
||||
|
||||
# hardcore path to ffmpeg and hide related settings
|
||||
(substituteAll {
|
||||
src = ./ffmpeg-path.patch;
|
||||
(replaceVars ./ffmpeg-path.patch {
|
||||
ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
fetchpatch,
|
||||
stdenv,
|
||||
lib,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
aspellWithDicts,
|
||||
at-spi2-core ? null,
|
||||
atspiSupport ? true,
|
||||
|
|
@ -51,8 +51,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
inherit mousetweaks;
|
||||
})
|
||||
# Allow loading hunspell dictionaries installed in NixOS system path
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
python3,
|
||||
gtk3,
|
||||
gnome,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
at-spi2-atk,
|
||||
at-spi2-core,
|
||||
dbus,
|
||||
|
|
@ -39,8 +39,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
cat = "${coreutils}/bin/cat";
|
||||
lsof = "${lsof}/bin/lsof";
|
||||
pgrep = "${procps}/bin/pgrep";
|
||||
|
|
|
|||
|
|
@ -1,21 +1,19 @@
|
|||
{
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
diffutils,
|
||||
stdenv,
|
||||
patchPpdFilesHook,
|
||||
}:
|
||||
|
||||
let
|
||||
input = substituteAll {
|
||||
src = ./test.ppd;
|
||||
input = replaceVars ./test.ppd {
|
||||
keep = "cmp";
|
||||
patch = "cmp";
|
||||
pathkeep = "/bin/cmp";
|
||||
pathpatch = "/bin/cmp";
|
||||
};
|
||||
|
||||
output = substituteAll {
|
||||
src = ./test.ppd;
|
||||
output = replaceVars ./test.ppd {
|
||||
keep = "cmp";
|
||||
patch = "${diffutils}/bin/cmp";
|
||||
pathkeep = "/bin/cmp";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
stdenv,
|
||||
fetchFromGitLab,
|
||||
writeText,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
meson,
|
||||
pkg-config,
|
||||
ninja,
|
||||
|
|
@ -44,8 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# add support for loading plugins from /run to assist NixOS module
|
||||
./add-runtime-plugin-path.patch
|
||||
# fix FHS hardcoded paths
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
fcmatch = "${fontconfig}/bin/fc-match";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
makeWrapper,
|
||||
runtimeShell,
|
||||
symlinkJoin,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
extraPackages ? [ ],
|
||||
crun,
|
||||
runc,
|
||||
|
|
@ -85,8 +85,7 @@ buildGoModule rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./hardcode-paths.patch;
|
||||
(replaceVars ./hardcode-paths.patch {
|
||||
bin_path = helpersBin;
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
|
||||
# build-system
|
||||
pretix-plugin-build,
|
||||
|
|
@ -29,8 +29,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./passbook-openssl.patch;
|
||||
(replaceVars ./passbook-openssl.patch {
|
||||
openssl = lib.getExe openssl;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
ffmpeg,
|
||||
}:
|
||||
|
||||
|
|
@ -17,8 +17,7 @@ python3Packages.buildPythonApplication rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./ffmpeg-path.patch;
|
||||
(replaceVars ./ffmpeg-path.patch {
|
||||
ffmpeg = lib.getExe ffmpeg;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, replaceVars, swaybg
|
||||
, meson, ninja, pkg-config, wayland-scanner, scdoc
|
||||
, libGL, wayland, libxkbcommon, pcre2, json_c, libevdev
|
||||
, pango, cairo, libinput, gdk-pixbuf, librsvg
|
||||
|
|
@ -26,8 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
patches = [
|
||||
./load-configuration-from-etc.patch
|
||||
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
inherit swaybg;
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
stdenv,
|
||||
systemd,
|
||||
meson,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
swaybg,
|
||||
ninja,
|
||||
pkg-config,
|
||||
|
|
@ -57,8 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
[
|
||||
./load-configuration-from-etc.patch
|
||||
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
(replaceVars ./fix-paths.patch {
|
||||
inherit swaybg;
|
||||
})
|
||||
]
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
ninja,
|
||||
pkg-config,
|
||||
python3,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
systemdMinimal,
|
||||
usbutils,
|
||||
vala,
|
||||
|
|
@ -44,8 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# Replace references to udevadm with an absolute paths, so programs using
|
||||
# umockdev will just work without having to provide it in their test environment
|
||||
# $PATH.
|
||||
(substituteAll {
|
||||
src = ./substitute-udevadm.patch;
|
||||
(replaceVars ./substitute-udevadm.patch {
|
||||
udevadm = "${systemdMinimal}/bin/udevadm";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
forceInstallAllHacks ? true,
|
||||
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
|
||||
nixosTests,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
wrapperPrefix ? "/run/wrappers/bin",
|
||||
}:
|
||||
|
||||
|
|
@ -83,8 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./xscreensaver-wrapper-prefix.patch;
|
||||
(replaceVars ./xscreensaver-wrapper-prefix.patch {
|
||||
inherit wrapperPrefix;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue