diff options
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 a58430401c59a..48c4679cb3cd8 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 01d989e75b10a..85aa7456df5f5 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 8e38d368ec81f..31317a9397714 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 |