diff options
| author | oxalica <oxalicc@pm.me> | 2020-09-06 22:06:22 +0800 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-09-29 11:51:40 +0000 |
| commit | 3622d578447a8c5edd17ad7eb50657acc77fe872 (patch) | |
| tree | 21a0467aa6966122e7cd46a7df3a41a7dfa466be /nixpkgs | |
| parent | 638dece809fd21b0519a6227ab4a4f26092f11ea (diff) | |
| download | nixlib-3622d578447a8c5edd17ad7eb50657acc77fe872.tar nixlib-3622d578447a8c5edd17ad7eb50657acc77fe872.tar.gz nixlib-3622d578447a8c5edd17ad7eb50657acc77fe872.tar.bz2 nixlib-3622d578447a8c5edd17ad7eb50657acc77fe872.tar.lz nixlib-3622d578447a8c5edd17ad7eb50657acc77fe872.tar.xz nixlib-3622d578447a8c5edd17ad7eb50657acc77fe872.tar.zst nixlib-3622d578447a8c5edd17ad7eb50657acc77fe872.zip | |
linux: remove dependency to utillinuxMinimal
(cherry picked from commit b5212f8bf0a1d3a864b5798df0e061109276b639)
Diffstat (limited to 'nixpkgs')
| -rw-r--r-- | nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix index 3a2682b2cfe8..92dc334135ad 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,6 +1,5 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl , libelf, cpio, elfutils -, utillinuxMinimal , writeTextFile }: @@ -281,7 +280,6 @@ let in assert (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") -> libelf != null; -assert stdenv.lib.versionAtLeast version "4.15" -> utillinuxMinimal != null; assert stdenv.lib.versionAtLeast version "5.8" -> elfutils != null; stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // { @@ -294,7 +292,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ] ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools ++ optional (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf - ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinuxMinimal + # Removed utillinuxMinimal since it should not be a dependency. ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio ++ optional (stdenv.lib.versionAtLeast version "5.8") elfutils |