diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:08:19 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:08:19 +0100 |
| commit | 5be0a9acd7b9abe4bff3202a7ac7defc17a37877 (patch) | |
| tree | 25491a83f604f1ace6a1170505955df5817495c2 /pkgs/os-specific/linux | |
| parent | f4ed8a3b911628335a53b3b5ddb48e9ec8d8bdcf (diff) | |
| download | nixpkgs-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar nixpkgs-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.gz nixpkgs-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.bz2 nixpkgs-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.lz nixpkgs-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.xz nixpkgs-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.zst nixpkgs-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.zip | |
Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms "hostDrv" and "buildDrv" are not very intuitive, even if they're consistent with GNU terminology).
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/perf.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pam/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index a58430401c5..48c4679cb3c 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -119,8 +119,8 @@ stdenv.mkDerivation { # The substitution of crossAttrs happens *after* the stdenv cross adapter sets # the parameters for the usual stdenv. Thus, we need to specify - # the ".hostDrv" in the buildInputs here. - buildInputs = lib.optional (cp.uboot != null) (ubootChooser cp.uboot).hostDrv; + # the ".crossDrv" in the buildInputs here. + buildInputs = lib.optional (cp.uboot != null) (ubootChooser cp.uboot).crossDrv; }; meta = { diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 01d989e75b1..85aa7456df5 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation { crossAttrs = { /* I don't want cross-python or cross-perl - I don't know if cross-python even works */ - propagatedBuildInputs = [ elfutils.hostDrv newt.hostDrv ]; + propagatedBuildInputs = [ elfutils.crossDrv newt.crossDrv ]; makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-"; - elfutils = elfutils.hostDrv; + elfutils = elfutils.crossDrv; }; meta = { diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 8e38d368ec8..31317a93977 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { crossAttrs = { # Skip libxcrypt cross-building, as it fails for mips and arm - propagatedBuildInputs = [ flex.hostDrv cracklib.hostDrv ]; + propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ]; preConfigure = preConfigure + '' - ar x ${flex.hostDrv}/lib/libfl.a + ar x ${flex.crossDrv}/lib/libfl.a mv libyywrap.o libyywrap-target.o ar x ${flex}/lib/libfl.a mv libyywrap.o libyywrap-host.o |