Merge pull request #318935 from danielbarter/nixd-crosscompile

nixd: fix cross compiling
This commit is contained in:
Jörg Thalheim 2024-06-12 10:26:34 +02:00 committed by GitHub
commit 4f537018d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -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