From 459fb59493d62b97e7e5219d542fcddc62aab0b5 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 28 Mar 2025 10:45:27 -0400
Subject: [PATCH] Remove boost env vars

https://github.com/NixOS/nixpkgs/issues/86131 is now fixed!
---
 packaging/dev-shell.nix  | 4 ----
 src/libexpr/package.nix  | 7 -------
 src/libstore/package.nix | 7 -------
 src/libutil/package.nix  | 7 -------
 4 files changed, 25 deletions(-)

diff --git a/packaging/dev-shell.nix b/packaging/dev-shell.nix
index 1b6c37f35..e824ebf71 100644
--- a/packaging/dev-shell.nix
+++ b/packaging/dev-shell.nix
@@ -72,10 +72,6 @@ pkgs.nixComponents.nix-util.overrideAttrs (
     src = null;
 
     env = {
-      # Needed for Meson to find Boost.
-      # https://github.com/NixOS/nixpkgs/issues/86131.
-      BOOST_INCLUDEDIR = "${lib.getDev pkgs.nixDependencies.boost}/include";
-      BOOST_LIBRARYDIR = "${lib.getLib pkgs.nixDependencies.boost}/lib";
       # For `make format`, to work without installing pre-commit
       _NIX_PRE_COMMIT_HOOKS_CONFIG = "${(pkgs.formats.yaml { }).generate "pre-commit-config.yaml"
         modular.pre-commit.settings.rawConfig
diff --git a/src/libexpr/package.nix b/src/libexpr/package.nix
index 533dae9f2..141b77fac 100644
--- a/src/libexpr/package.nix
+++ b/src/libexpr/package.nix
@@ -81,13 +81,6 @@ mkMesonLibrary (finalAttrs: {
     (lib.mesonEnable "gc" enableGC)
   ];
 
-  env = {
-    # Needed for Meson to find Boost.
-    # https://github.com/NixOS/nixpkgs/issues/86131.
-    BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-    BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-  };
-
   meta = {
     platforms = lib.platforms.unix ++ lib.platforms.windows;
   };
diff --git a/src/libstore/package.nix b/src/libstore/package.nix
index 31867d331..11c8be261 100644
--- a/src/libstore/package.nix
+++ b/src/libstore/package.nix
@@ -78,13 +78,6 @@ mkMesonLibrary (finalAttrs: {
       (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
     ];
 
-  env = {
-    # Needed for Meson to find Boost.
-    # https://github.com/NixOS/nixpkgs/issues/86131.
-    BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-    BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-  };
-
   meta = {
     platforms = lib.platforms.unix ++ lib.platforms.windows;
   };
diff --git a/src/libutil/package.nix b/src/libutil/package.nix
index a0b80ade7..8114dd645 100644
--- a/src/libutil/package.nix
+++ b/src/libutil/package.nix
@@ -58,13 +58,6 @@ mkMesonLibrary (finalAttrs: {
     (lib.mesonEnable "cpuid" stdenv.hostPlatform.isx86_64)
   ];
 
-  env = {
-    # Needed for Meson to find Boost.
-    # https://github.com/NixOS/nixpkgs/issues/86131.
-    BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-    BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-  };
-
   meta = {
     platforms = lib.platforms.unix ++ lib.platforms.windows;
   };