Merge pull request #39666 from dtzWill/fix/stdenv-system-nix

nix: fix stdenv.system check -- should be hostPlatform
This commit is contained in:
Will Dietz 2018-04-30 20:52:20 -05:00 committed by GitHub
commit 47b25136b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -41,7 +41,7 @@ let
propagatedBuildInputs = [ boehmgc ]; propagatedBuildInputs = [ boehmgc ];
# Seems to be required when using std::atomic with 64-bit types # 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 = configureFlags =
[ "--with-store-dir=${storeDir}" [ "--with-store-dir=${storeDir}"