b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
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
parent d1165dba99 6e8118b239
commit 47b25136b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/tools/package-management/nix/default.nix
View file

@ -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}"