linux: remove dependency to utillinuxMinimal
This commit is contained in:
parent
126197c1d4
commit
b5212f8bf0
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user