File tree 4 files changed +0
-25
lines changed 4 files changed +0
-25
lines changed Original file line number Diff line number Diff line change @@ -72,10 +72,6 @@ pkgs.nixComponents.nix-util.overrideAttrs (
72
72
src = null ;
73
73
74
74
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" ;
79
75
# For `make format`, to work without installing pre-commit
80
76
_NIX_PRE_COMMIT_HOOKS_CONFIG = "${ ( pkgs . formats . yaml { } ) . generate "pre-commit-config.yaml"
81
77
modular . pre-commit . settings . rawConfig
Original file line number Diff line number Diff line change @@ -81,13 +81,6 @@ mkMesonLibrary (finalAttrs: {
81
81
( lib . mesonEnable "gc" enableGC )
82
82
] ;
83
83
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
-
91
84
meta = {
92
85
platforms = lib . platforms . unix ++ lib . platforms . windows ;
93
86
} ;
Original file line number Diff line number Diff line change @@ -78,13 +78,6 @@ mkMesonLibrary (finalAttrs: {
78
78
( lib . mesonOption "sandbox-shell" "${ busybox-sandbox-shell } /bin/busybox" )
79
79
] ;
80
80
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
-
88
81
meta = {
89
82
platforms = lib . platforms . unix ++ lib . platforms . windows ;
90
83
} ;
Original file line number Diff line number Diff line change @@ -58,13 +58,6 @@ mkMesonLibrary (finalAttrs: {
58
58
( lib . mesonEnable "cpuid" stdenv . hostPlatform . isx86_64 )
59
59
] ;
60
60
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
-
68
61
meta = {
69
62
platforms = lib . platforms . unix ++ lib . platforms . windows ;
70
63
} ;
You can’t perform that action at this time.
0 commit comments