From 970c092597705f4262b03defd05dad6e4562c792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Wed, 18 May 2022 21:43:23 -0300 Subject: [PATCH] nix: mark nocross. Commit 51c4b1859ab0d07f84a9e90018225ec67c9b9c6f removed the libcpuid dependency, which enabled the build for ARM archs, despite the package not having been tested there. The current template is not ready for cross compilation. The build initially failed with: LD /usr/lib32/libnixstore.so [cc-wrapper] ignoring -L/usr/lib32 /usr/lib/gcc/armv7l-linux-musleabihf/10.2.1/../../../../armv7l-linux-musleabihf/bin/ld: cannot find -lnixutil because the libinixutil.so file was located in /usr/lib32 of the masterdir, which should never have happened. Bypassing that error also leads us to: LD /usr/lib32/libnixexpr.so /usr/lib/gcc/armv7l-linux-musleabihf/10.2.1/../../../../armv7l-linux-musleabihf/bin/ld: cannot find -latomic_ops meaning the build requires further fixes for armv*, probably beyond cross compilation. Still add jq to hostmakedepends, since the build requires the jq binary as well. --- srcpkgs/nix/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index da3fea0347a..b6352688454 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh" -hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook" +hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq" makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel liblzma-devel openssl-devel libsodium-devel sqlite-devel libseccomp-devel editline-devel jq-devel libarchive-devel @@ -19,6 +19,7 @@ changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#s distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz" checksum=91a7f2bcdde3263927d842f04a345ed77319148c700e2c8be01498724e6808c0 disable_parallel_build=yes +nocross="cross build populates /usr/lib32 with libraries and tries to link against them" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat"