diff options
| author | hsloan <ishaqsloan@gmail.com> | 2017-06-28 16:48:43 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 21:29:07 -0400 |
| commit | 40be9738abfcde500937f1d7e2356164e77658e8 (patch) | |
| tree | 8526cbf68dc9e1d6ebda320d3bd85658a92ef464 /pkgs/tools | |
| parent | 822084fa37192b41fb234e01a220efa064c0d64b (diff) | |
| download | nixlib-40be9738abfcde500937f1d7e2356164e77658e8.tar nixlib-40be9738abfcde500937f1d7e2356164e77658e8.tar.gz nixlib-40be9738abfcde500937f1d7e2356164e77658e8.tar.bz2 nixlib-40be9738abfcde500937f1d7e2356164e77658e8.tar.lz nixlib-40be9738abfcde500937f1d7e2356164e77658e8.tar.xz nixlib-40be9738abfcde500937f1d7e2356164e77658e8.tar.zst nixlib-40be9738abfcde500937f1d7e2356164e77658e8.zip | |
nix: Don't use stdenv.cross
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 3aa18fad9423..45dfd52dba19 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -2,6 +2,7 @@ , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, readline , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl , libseccomp, busybox +, hostPlatform , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" @@ -95,8 +96,8 @@ let --disable-init-state --enable-gc '' + stdenv.lib.optionalString ( - stdenv.cross ? nix && stdenv.cross.nix ? system - ) ''--with-system=${stdenv.cross.nix.system}''; + hostPlatform ? nix && hostPlatform.nix ? system + ) ''--with-system=${hostPlatform.nix.system}''; doInstallCheck = false; }; |