Merge pull request #9796 from obsidiansystems/cleanup-dep-patches

Move dependency patches from top level into subdir
2024-11-24 07:42:27 +00:00 · 2024-01-17 20:06:27 +01:00 · 2024-01-17 20:06:27 +01:00 · 1d89c7b02e
commit 1d89c7b02e
parent 799f2d0699 1de8eed28a
4 changed files with 2 additions and 3 deletions
--- a/dep-patches/boehmgc-coroutine-sp-fallback.diff
+++ b/dep-patches/boehmgc-coroutine-sp-fallback.diff
--- a/dep-patches/boehmgc-traceable_allocator-public.diff
+++ b/dep-patches/boehmgc-traceable_allocator-public.diff
--- a/flake.nix
+++ b/flake.nix
@ -163,10 +163,10 @@
            enableLargeConfig = true;
          }).overrideAttrs(o: {
            patches = (o.patches or []) ++ [
-              ./boehmgc-coroutine-sp-fallback.diff
+              ./dep-patches/boehmgc-coroutine-sp-fallback.diff

              # https://github.com/ivmai/bdwgc/pull/586
-              ./boehmgc-traceable_allocator-public.diff
+              ./dep-patches/boehmgc-traceable_allocator-public.diff
            ];
          });

--- a/package.nix
+++ b/package.nix
@ -174,7 +174,6 @@ in {
          ./mk
          (fileset.fileFilter (f: lib.strings.hasPrefix "nix-profile" f.name) ./scripts)
        ] ++ lib.optionals doBuild [
-          ./boehmgc-coroutine-sp-fallback.diff
          ./doc
          ./misc
          ./precompiled-headers.h