From 6e8118b2395ab928594e20585dba1e83c8354820 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 28 Apr 2018 22:11:30 -0500 Subject: [PATCH] nix: fix stdenv.system check -- should be hostPlatform (stdenv.system is the system running the build, apparently) --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index aee6678d116..23099489723 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -41,7 +41,7 @@ let propagatedBuildInputs = [ boehmgc ]; # Seems to be required when using std::atomic with 64-bit types - NIX_LDFLAGS = lib.optionalString (stdenv.system == "armv6l-linux") "-latomic"; + NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.system == "armv6l-linux") "-latomic"; configureFlags = [ "--with-store-dir=${storeDir}"