Merge pull request #104776 from grahamc/utillinux
utillinux: rename to util-linux
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
|
||||
{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.165-172";
|
||||
|
||||
@@ -302,7 +302,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
|
||||
# Removed utillinuxMinimal since it should not be a dependency.
|
||||
# Removed util-linuxMinimal 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
|
||||
|
||||
Reference in New Issue
Block a user