Merge pull request #318935 from danielbarter/nixd-crosscompile
nixd: fix cross compiling
This commit is contained in:
commit
4f537018d0
@ -2,6 +2,7 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
cmake,
|
||||||
boost182,
|
boost182,
|
||||||
gtest,
|
gtest,
|
||||||
llvmPackages,
|
llvmPackages,
|
||||||
@ -36,6 +37,8 @@ let
|
|||||||
|
|
||||||
mesonBuildType = "release";
|
mesonBuildType = "release";
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
@ -129,6 +132,8 @@ in
|
|||||||
boost182
|
boost182
|
||||||
];
|
];
|
||||||
|
|
||||||
|
nativeBuildInputs = common.nativeBuildInputs ++ [ cmake ];
|
||||||
|
|
||||||
env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";
|
env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";
|
||||||
|
|
||||||
# See https://github.com/nix-community/nixd/issues/519
|
# See https://github.com/nix-community/nixd/issues/519
|
||||||
|
Loading…
Reference in New Issue
Block a user