gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nix: Remove boost env vars

Browse Source 
Because https://github.com/NixOS/nixpkgs/issues/86131 is fixed --- this
is not actually a Nix-version-specific thing, but a Nixpkgs-specific
thing.

Counterpart to
https://github.com/NixOS/nix/pull/12772/commits/459fb59493d62b97e7e5219d542fcddc62aab0b5
This commit is contained in:
John Ericson
2025-06-17 11:54:37 -04:00
parent ddca1d0a43
commit e6165dbd48
3 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/package-management/nix/modular/src/libexpr/package.nix
-7
View File
@@ -63,13 +63,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;
};
pkgs/tools/package-management/nix/modular/src/libstore/package.nix
-7
View File
@@ -56,13 +56,6 @@ mkMesonLibrary (finalAttrs: {
(lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
];
env = lib.optionalAttrs (!lib.versionAtLeast version "2.27") {
# 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;
};
pkgs/tools/package-management/nix/modular/src/libutil/package.nix
-7
View File
@@ -46,13 +46,6 @@ mkMesonLibrary (finalAttrs: {
(lib.mesonEnable "cpuid" stdenv.hostPlatform.isx86_64)
];
env = lib.optionalAttrs (!lib.versionAtLeast version "2.27") {
# 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;
};