From 860b938bbf27d6b44d0ea60ec5a0ff1320072291 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 20 Sep 2021 13:47:32 +0000 Subject: [PATCH] capnproto: fix cross capnproto tries to compile some capnproto files, so when cross-compiling we need to give it the build platform's capnproto binary or it'll try to execute the one for the host platform. --- pkgs/development/libraries/capnproto/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index 7493426e227f..713a49dbaa6c 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, capnproto, cmake }: stdenv.mkDerivation rec { pname = "capnproto"; @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-soBUp6K/6kK/w5LI0AljDZTXLozoaiOtbxi15yV0Bk8="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] + ++ lib.optional (!(stdenv.hostPlatform.isCompatible stdenv.buildPlatform)) capnproto; + + cmakeFlags = lib.optional (!(stdenv.hostPlatform.isCompatible stdenv.buildPlatform)) "-DEXTERNAL_CAPNP"; meta = with lib; { homepage = "https://capnproto.org/";