From 75ae868bde6edbfbb8b4f1ead7f6975ff38c450c Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 8 Jun 2024 22:49:55 +0000 Subject: [PATCH] nixpkgs: don't fail build if a patch has already been applied --- pkgs/additional/nixpkgs/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/additional/nixpkgs/default.nix b/pkgs/additional/nixpkgs/default.nix index 728b671e..91eff0ac 100644 --- a/pkgs/additional/nixpkgs/default.nix +++ b/pkgs/additional/nixpkgs/default.nix @@ -51,6 +51,13 @@ let inherit variant; date = unpatchedSrc.lastModifiedDate; }; + # skip applied patches + prePatch = '' + realpatch=$(command -v patch) + patch() { + OUT=$($realpatch "$@") || echo "$OUT" | grep "Skipping patch" -q + } + ''; }; src = if doPatch then patchedSrc else { outPath = unpatchedSrc; };