commit 8a9b8cd39e28342b0f051ec139f96b3ab2df7233 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

isc-cron: fix substituteAll usage

K900 1 year ago 8a9b8cd3 ed8c856e

+4 -4

2 changed files

expand all

unified split

pkgs

by-name

isc-cron

0000-nixpkgs-specific.diff

package.nix

+2 -2

pkgs/by-name/is/isc-cron/0000-nixpkgs-specific.diff

··· 35 +#define _PATH_SENDMAIL "@sendmailPath@" 36 + 37 +#undef _PATH_VI 38 - +#define _PATH_VI "@VIPATH@" 39 + 40 +#undef _PATH_DEFPATH 41 - +#define _PATH_DEFPATH "@DEFPATH@" 42 + 43 +/* Nixpkgs-specific patch end */ 44 +

··· 35 +#define _PATH_SENDMAIL "@sendmailPath@" 36 + 37 +#undef _PATH_VI 38 + +#define _PATH_VI "@viPath@" 39 + 40 +#undef _PATH_DEFPATH 41 + +#define _PATH_DEFPATH "@defPath@" 42 + 43 +/* Nixpkgs-specific patch end */ 44 +

+2 -2

pkgs/by-name/is/isc-cron/package.nix

··· 20 (substituteAll { 21 src = ./0000-nixpkgs-specific.diff; 22 inherit sendmailPath; 23 - VIPATH = lib.getExe' vim "vim"; 24 - DEFPATH = lib.concatStringsSep ":" [ 25 "/run/wrappers/bin" 26 "/nix/var/nix/profiles/default/bin" 27 "/run/current-system/sw/bin"

··· 20 (substituteAll { 21 src = ./0000-nixpkgs-specific.diff; 22 inherit sendmailPath; 23 + viPath = lib.getExe' vim "vim"; 24 + defPath = lib.concatStringsSep ":" [ 25 "/run/wrappers/bin" 26 "/nix/var/nix/profiles/default/bin" 27 "/run/current-system/sw/bin"