From 01ede8c61571b580f6f6ab08dd6513638c8f2a1e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 6 Jul 2020 01:46:10 -0400 Subject: [PATCH 1/2] =?UTF-8?q?nix:=20don=E2=80=99t=20precompile=20headers?= =?UTF-8?q?=20on=20cross=20compilation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit avoids this error: mk/precompiled-headers.mk:38: *** Don't know how to precompile headers on aarch64-unknown-linux-gnu-g++. Stop. --- pkgs/tools/package-management/nix/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index a7eca679780..7c597319071 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -119,7 +119,8 @@ common = # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; - makeFlags = [ "profiledir=$(out)/etc/profile.d" ]; + makeFlags = [ "profiledir=$(out)/etc/profile.d" ] + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0"; installFlags = [ "sysconfdir=$(out)/etc" ]; From 00be3fac9ffe34afe2d874088d76494c1f861a31 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 6 Jul 2020 01:46:43 -0400 Subject: [PATCH 2/2] nix: gmock is a library https://hydra.nixos.org/build/123111516 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 7c597319071..5af539bd917 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -42,14 +42,14 @@ common = nativeBuildInputs = [ pkgconfig ] ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt - docbook5 docbook_xsl_ns jq gmock ]; + docbook5 docbook_xsl_ns jq ]; buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json brotli boost editline ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is24 [ libarchive ] + ++ lib.optionals is24 [ libarchive gmock ] ++ lib.optional withLibseccomp libseccomp ++ lib.optional withAWS ((aws-sdk-cpp.override {