diff options
| author | Will Dietz <github@wdtz.org> | 2018-04-30 20:52:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 20:52:20 -0500 |
| commit | 47b25136b19c57a9baf32bd13b5e6511ea8d8d97 (patch) | |
| tree | 5a39dfd535350a3ef8daa7bb19ed9b51a4d2c8a4 | |
| parent | d1165dba9979b6bd4ba063b7e39384ece33eec4e (diff) | |
| parent | 6e8118b2395ab928594e20585dba1e83c8354820 (diff) | |
Merge pull request #39666 from dtzWill/fix/stdenv-system-nix
nix: fix stdenv.system check -- should be hostPlatform
| -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 aee6678d11673..230994897234f 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}" |