From d686ba03db744c4e29d5e672f4cfdf94e2448ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 3 Sep 2024 12:51:02 +0200 Subject: [PATCH] hwinfo: fix cross compilation --- pkgs/by-name/hw/hwinfo/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix index a034bf9b3773..14e922df1533 100644 --- a/pkgs/by-name/hw/hwinfo/package.nix +++ b/pkgs/by-name/hw/hwinfo/package.nix @@ -78,12 +78,18 @@ stdenv.mkDerivation (finalAttrs: { perl -pi -e 'undef $_ if /^C\s/..1' src/usb perl ./convert_hd src/pci perl ./convert_hd src/usb - - make check_hd CC=$CC_FOR_BUILD popd + + # build tools for build arch + make -C src/ids CC=$CC_FOR_BUILD -j $NIX_BUILD_CORES check_hd + make -C src/isdn/cdb CC=$CC_FOR_BUILD -j $NIX_BUILD_CORES isdn_cdb mk_isdnhwdb ''; - makeFlags = [ "LIBDIR=/lib" ]; + makeFlags = [ + "LIBDIR=/lib" + "CC=${stdenv.cc.targetPrefix}cc" + "ARCH=${stdenv.hostPlatform.uname.processor}" + ]; installFlags = [ "DESTDIR=$(out)" ]; passthru = {