public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix: Don't use stdenv.cross

Browse Source
This commit is contained in:
hsloan 2017-06-28 16:48:43 -04:00 committed by John Ericson
parent 822084fa37
commit 40be9738ab
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/package-management/nix/default.nix
View File

@ -2,6 +2,7 @@
, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, readline , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, readline
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
, libseccomp, busybox , libseccomp, busybox
, hostPlatform
, storeDir ? "/nix/store" , storeDir ? "/nix/store"
, stateDir ? "/nix/var" , stateDir ? "/nix/var"
, confDir ? "/etc" , confDir ? "/etc"
@ -95,8 +96,8 @@ let
--disable-init-state --disable-init-state
--enable-gc --enable-gc
'' + stdenv.lib.optionalString ( '' + stdenv.lib.optionalString (
stdenv.cross ? nix && stdenv.cross.nix ? system hostPlatform ? nix && hostPlatform.nix ? system
) ''--with-system=${stdenv.cross.nix.system}''; ) ''--with-system=${hostPlatform.nix.system}'';
doInstallCheck = false; doInstallCheck = false;
}; };