diff options
| author | Florian Klink <flokli@flokli.de> | 2020-09-06 22:24:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-06 22:24:19 +0200 |
| commit | b85325a72a0dd628541aa914e08d72a19fbe42c7 (patch) | |
| tree | 41c6354013b0aa37dd7d4f40d0370a9d46dbb94f /pkgs/os-specific | |
| parent | e560459c5b06ce1351ae5eb8988f8ce87602058a (diff) | |
| parent | b5212f8bf0a1d3a864b5798df0e061109276b639 (diff) | |
| download | nixpkgs-b85325a72a0dd628541aa914e08d72a19fbe42c7.tar nixpkgs-b85325a72a0dd628541aa914e08d72a19fbe42c7.tar.gz nixpkgs-b85325a72a0dd628541aa914e08d72a19fbe42c7.tar.bz2 nixpkgs-b85325a72a0dd628541aa914e08d72a19fbe42c7.tar.lz nixpkgs-b85325a72a0dd628541aa914e08d72a19fbe42c7.tar.xz nixpkgs-b85325a72a0dd628541aa914e08d72a19fbe42c7.tar.zst nixpkgs-b85325a72a0dd628541aa914e08d72a19fbe42c7.zip | |
Merge pull request #97294 from oxalica/linux-no-utillinux
linux: remove dependency to utillinuxMinimal
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 3a2682b2cfe..92dc334135a 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/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 |