From 22df7410454b8041f9604c068662efddd2f08c9f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 11 Mar 2018 19:44:22 +0200 Subject: [PATCH] nix: Fix build on ARMv6 --- pkgs/tools/package-management/nix/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index a768ff84802..5140ddd0283 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -39,6 +39,9 @@ let propagatedBuildInputs = [ boehmgc ]; + # Seems to be required when using std::atomic with 64-bit types + NIX_LDFLAGS = lib.optionalString (stdenv.system == "armv6l-linux") "-latomic"; + configureFlags = [ "--with-store-dir=${storeDir}" "--localstatedir=${stateDir}"