Skip to content

Commit 71b0edc

Browse files
Ericson2314mergify[bot]
authored andcommitted
Remove boost env vars
NixOS/nixpkgs#86131 is now fixed! (cherry picked from commit 459fb59)
1 parent 1763cf1 commit 71b0edc

File tree

4 files changed

+0
-25
lines changed

4 files changed

+0
-25
lines changed

packaging/dev-shell.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ pkgs.nixComponents.nix-util.overrideAttrs (
7272
src = null;
7373

7474
env = {
75-
# Needed for Meson to find Boost.
76-
# https://github.com/NixOS/nixpkgs/issues/86131.
77-
BOOST_INCLUDEDIR = "${lib.getDev pkgs.nixDependencies.boost}/include";
78-
BOOST_LIBRARYDIR = "${lib.getLib pkgs.nixDependencies.boost}/lib";
7975
# For `make format`, to work without installing pre-commit
8076
_NIX_PRE_COMMIT_HOOKS_CONFIG = "${(pkgs.formats.yaml { }).generate "pre-commit-config.yaml"
8177
modular.pre-commit.settings.rawConfig

src/libexpr/package.nix

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,6 @@ mkMesonLibrary (finalAttrs: {
8181
(lib.mesonEnable "gc" enableGC)
8282
];
8383

84-
env = {
85-
# Needed for Meson to find Boost.
86-
# https://github.com/NixOS/nixpkgs/issues/86131.
87-
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
88-
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
89-
};
90-
9184
meta = {
9285
platforms = lib.platforms.unix ++ lib.platforms.windows;
9386
};

src/libstore/package.nix

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@ mkMesonLibrary (finalAttrs: {
7878
(lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
7979
];
8080

81-
env = {
82-
# Needed for Meson to find Boost.
83-
# https://github.com/NixOS/nixpkgs/issues/86131.
84-
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
85-
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
86-
};
87-
8881
meta = {
8982
platforms = lib.platforms.unix ++ lib.platforms.windows;
9083
};

src/libutil/package.nix

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,6 @@ mkMesonLibrary (finalAttrs: {
5858
(lib.mesonEnable "cpuid" stdenv.hostPlatform.isx86_64)
5959
];
6060

61-
env = {
62-
# Needed for Meson to find Boost.
63-
# https://github.com/NixOS/nixpkgs/issues/86131.
64-
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
65-
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
66-
};
67-
6861
meta = {
6962
platforms = lib.platforms.unix ++ lib.platforms.windows;
7063
};

0 commit comments

Comments
 (0)