diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-11-03 15:55:09 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-11-05 15:11:12 +0200 |
| commit | b50693d16ca394690bfec52ddd9eaf43d346ca8b (patch) | |
| tree | 689b4a6b19a65baa5e2eddd378f52332eb4066f5 /pkgs/os-specific/linux/kernel/manual-config.nix | |
| parent | cf610f8a48dd10be105881393fae5857c8cbfd71 (diff) | |
| download | nixpkgs-b50693d16ca394690bfec52ddd9eaf43d346ca8b.tar nixpkgs-b50693d16ca394690bfec52ddd9eaf43d346ca8b.tar.gz nixpkgs-b50693d16ca394690bfec52ddd9eaf43d346ca8b.tar.bz2 nixpkgs-b50693d16ca394690bfec52ddd9eaf43d346ca8b.tar.lz nixpkgs-b50693d16ca394690bfec52ddd9eaf43d346ca8b.tar.xz nixpkgs-b50693d16ca394690bfec52ddd9eaf43d346ca8b.tar.zst nixpkgs-b50693d16ca394690bfec52ddd9eaf43d346ca8b.zip | |
kernel, initrd: Remove legacy ubootChooser
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 8227475f1b1..61349175c78 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl -, writeTextFile, ubootChooser +, writeTextFile, ubootTools , hostPlatform }: @@ -225,7 +225,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe enableParallelBuilding = true; nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] ++ optional (stdenv.platform.uboot != null) - (ubootChooser stdenv.platform.uboot); + ubootTools; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; @@ -248,6 +248,6 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe # crossDrv builds x86 tools on x86 (but arm uboot). If this is fixed, uboot # can just go into buildInputs (but not nativeBuildInputs since cp.uboot # may be different from stdenv.platform.uboot) - buildInputs = optional (cp.uboot != null) (ubootChooser cp.uboot).crossDrv; + buildInputs = optional (cp.uboot != null) ubootTools.crossDrv; }; }) |