diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2019-12-30 10:14:18 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2019-12-30 10:14:18 -0800 |
| commit | 446fec8c2dda7ab24783713f16092803b7b1e464 (patch) | |
| tree | bda175eabb91dd480448aa3c24875de73640e8a4 /pkgs/tools/package-management | |
| parent | 99de1a8ebb9df72642c259de63c4f0d2d1c770e7 (diff) | |
| parent | 97da2d22fed6b55d331c565a5817e97d74063397 (diff) | |
| download | nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar.gz nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar.bz2 nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar.lz nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar.xz nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.tar.zst nixlib-446fec8c2dda7ab24783713f16092803b7b1e464.zip | |
Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ce2936f96f3f..33ec396e5d22 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -57,7 +57,7 @@ common = propagatedBuildInputs = [ boehmgc ]; # Seems to be required when using std::atomic with 64-bit types - NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.system == "armv6l-linux") "-latomic"; + NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux" || stdenv.hostPlatform.system == "armv6l-linux") "-latomic"; preConfigure = # Copy libboost_context so we don't get all of Boost in our closure. |