1 files changed, 7 insertions, 19 deletions

diff --git a/flake.nix b/flake.nix
index f1669777c..76b397b29 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,6 @@
 
     let
       inherit (nixpkgs) lib;
-      inherit (lib) fileset;
 
       officialRelease = true;
 
@@ -92,8 +91,6 @@
             (lib.versionAtLeast daemon.version "2.4pre20211005" &&
             lib.versionAtLeast client.version "2.4pre20211005")
             "-${client.version}-against-${daemon.version}";
-
-            inherit fileset;
         };
       in nix.overrideAttrs (prevAttrs: {
         NIX_DAEMON_PACKAGE = daemon;
@@ -163,16 +160,6 @@
           build-release-notes =
             final.buildPackages.callPackage ./maintainers/build-release-notes.nix { };
           clangbuildanalyzer = final.buildPackages.callPackage ./misc/clangbuildanalyzer.nix { };
-          boehmgc-nix = (final.boehmgc.override {
-            enableLargeConfig = true;
-          }).overrideAttrs (o: {
-            patches = (o.patches or [ ]) ++ [
-              ./boehmgc-coroutine-sp-fallback.diff
-
-              # https://github.com/ivmai/bdwgc/pull/586
-              ./boehmgc-traceable_allocator-public.diff
-            ];
-          });
 
           default-busybox-sandbox-shell = final.busybox.override {
             useMusl = true;
@@ -201,12 +188,15 @@
           nix-doc = final.callPackage ./nix-doc/package.nix {};
 
           nix = final.callPackage ./package.nix {
-            inherit versionSuffix fileset;
+            inherit versionSuffix;
             stdenv = currentStdenv;
-            boehmgc = final.boehmgc-nix;
             busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell;
             nix-doc = final.nix-doc;
           };
+
+          # Export the patched version of boehmgc that Lix uses into the overlay
+          # for consumers of this flake.
+          boehmgc-nix = final.nix.boehmgc-nix;
         };
 
     in {
@@ -265,10 +255,9 @@
           inherit (nixpkgs) pkgs;
 
           nix = pkgs.callPackage ./package.nix {
-            inherit versionSuffix fileset officialRelease buildUnreleasedNotes;
+            inherit versionSuffix officialRelease buildUnreleasedNotes;
             inherit (pkgs) build-release-notes;
             internalApiDocs = true;
-            boehmgc = pkgs.boehmgc-nix;
             busybox-sandbox-shell = pkgs.busybox-sandbox-shell;
           };
         in
@@ -405,8 +394,7 @@
         makeShell = pkgs: stdenv:
           let
             nix = pkgs.callPackage ./package.nix {
-              inherit stdenv versionSuffix fileset;
-              boehmgc = pkgs.boehmgc-nix;
+              inherit stdenv versionSuffix;
               busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox;
               forDevShell = true;
             };