diff options
| author | Marwan Aljubeh <marwan.aljubeh@gmail.com> | 2023-03-07 13:35:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-07 13:35:24 +0000 |
| commit | 42e0e4f3b4aadcae627f65a395600ea17fd6f9f0 (patch) | |
| tree | b477bf22fceb98c7cdf0acedb033b7606c3fbd1b /modules/system | |
| parent | e62b83a934ea44d6da145cfe02b2d401d95d174f (diff) | |
Add `--force` to all patch invocations
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 bb384e8..3b9d980 100644 --- a/modules/system/patches.nix +++ b/modules/system/patches.nix @@ -56,14 +56,14 @@ 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 --force --reverse --dry-run -d / -p1 < '${f}' &> /dev/null; then - patch --forward --backup -d / -p1 < '${f}' || true + patch --force --forward --backup -d / -p1 < '${f}' || true fi '') cfg.patches} ''; |