diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2023-05-10 23:22:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-10 23:22:40 +0200 |
| commit | 5061eb45573b19f6ea5958676d15b3198b512ac0 (patch) | |
| tree | 5465e1a222380ca8ce8d7a50bc59af66f47e88fb /modules/system | |
| parent | 9520a6e48393d4bfefe1cd47b726b7c10a3b9b6c (diff) | |
| parent | ca62d93c6c6bf89891aa24071ad312fe923801f1 (diff) | |
Merge pull request #612 from maljub01/patch-1
Fix system.patches
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/patches.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/system/patches.nix b/modules/system/patches.nix index 92f45c1..452ed3b 100644 --- a/modules/system/patches.nix +++ b/modules/system/patches.nix @@ -56,13 +56,13 @@ in for f in $(ls /run/current-system/patches 2> /dev/null); do if test ! -e "${config.system.build.patches}/patches/$f"; then - patch --reverse --backup -d / -p1 < "/run/current-system/patches/$f" || true + patch --force --reverse --backup -d / -p1 < "/run/current-system/patches/$f" || true fi done ${concatMapStringsSep "\n" (f: '' f="$(basename ${f})" - if ! patch --reverse --dry-run -d / -p1 < '${f}' &> /dev/null; then + if ! patch --force --reverse --dry-run -d / -p1 < '${f}' &> /dev/null; then patch --forward --backup -d / -p1 < '${f}' || true fi '') cfg.patches} |