From d84c45d40763d9c622e885c87701e6fb71f7e604 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Fri, 19 Feb 2021 17:15:00 -0800 Subject: [PATCH] numactl: enable on all linux platforms This is a dependency of building VMs for e.g. ppc64 and riscv64 platform. Also fixed an issue with linking libatomic on riscv. --- pkgs/os-specific/linux/numactl/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index d796bf579f1..2f8a4feb030 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { patchShebangs test ''; + LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; + # You probably shouldn't ever run these! They will reconfigure Linux # NUMA settings, which on my build machine makes the rest of package # building ~5% slower until reboot. Ugh! @@ -26,6 +28,6 @@ stdenv.mkDerivation rec { description = "Library and tools for non-uniform memory access (NUMA) machines"; homepage = "https://github.com/numactl/numactl"; license = with licenses; [ gpl2 lgpl21 ]; # libnuma is lgpl21 - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; + platforms = platforms.linux; }; }