about summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-03-11 19:44:22 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2018-03-11 19:44:44 +0200
commit22df7410454b8041f9604c068662efddd2f08c9f (patch)
treede5eed2a76df2681f2c99089fbf356ef4be696f5 /pkgs/tools/package-management
parent46037503f69e25cf61870c84d2ccc48328020feb (diff)
downloadnixlib-22df7410454b8041f9604c068662efddd2f08c9f.tar
nixlib-22df7410454b8041f9604c068662efddd2f08c9f.tar.gz
nixlib-22df7410454b8041f9604c068662efddd2f08c9f.tar.bz2
nixlib-22df7410454b8041f9604c068662efddd2f08c9f.tar.lz
nixlib-22df7410454b8041f9604c068662efddd2f08c9f.tar.xz
nixlib-22df7410454b8041f9604c068662efddd2f08c9f.tar.zst
nixlib-22df7410454b8041f9604c068662efddd2f08c9f.zip
nix: Fix build on ARMv6
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/nix/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index a768ff848021..5140ddd0283d 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}"