pyrox.dev
Nix: Remove boost env vars (#417598)
authored by John Ericson and committed by GitHub 63057b5e fd0c3334
-7
pkgs/tools/package-management/nix/modular/src/libexpr/package.nix
-7
pkgs/tools/package-management/nix/modular/src/libexpr/package.nix
···
63
63
(lib.mesonEnable "gc" enableGC)
64
64
];
65
65
66
-
env = {
67
-
# Needed for Meson to find Boost.
68
-
# https://github.com/NixOS/nixpkgs/issues/86131.
69
-
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
70
-
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
71
-
};
72
-
73
66
meta = {
74
67
platforms = lib.platforms.unix ++ lib.platforms.windows;
75
68
};
-7
pkgs/tools/package-management/nix/modular/src/libstore/package.nix
-7
pkgs/tools/package-management/nix/modular/src/libstore/package.nix
···
56
56
(lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
57
57
];
58
58
59
-
env = lib.optionalAttrs (!lib.versionAtLeast version "2.27") {
60
-
# Needed for Meson to find Boost.
61
-
# https://github.com/NixOS/nixpkgs/issues/86131.
62
-
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
63
-
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
64
-
};
65
-
66
59
meta = {
67
60
platforms = lib.platforms.unix ++ lib.platforms.windows;
68
61
};
-7
pkgs/tools/package-management/nix/modular/src/libutil/package.nix
-7
pkgs/tools/package-management/nix/modular/src/libutil/package.nix
···
46
46
(lib.mesonEnable "cpuid" stdenv.hostPlatform.isx86_64)
47
47
];
48
48
49
-
env = lib.optionalAttrs (!lib.versionAtLeast version "2.27") {
50
-
# Needed for Meson to find Boost.
51
-
# https://github.com/NixOS/nixpkgs/issues/86131.
52
-
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
53
-
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
54
-
};
55
-
56
49
meta = {
57
50
platforms = lib.platforms.unix ++ lib.platforms.windows;
58
51
};