diff options
| author | Florian Klink <flokli@flokli.de> | 2020-04-29 11:56:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 11:56:51 +0200 |
| commit | fbc63c4a7bcec8f77c5d5a2cd48442ca16453460 (patch) | |
| tree | 0c4b3524350fedd404e9634232929b96918af88e /pkgs | |
| parent | 2874eebfd27731a8ceef3856be35338affd32eaa (diff) | |
| parent | d103dc49986ed4c7a242a832d4f74a85062e2395 (diff) | |
| download | nixpkgs-fbc63c4a7bcec8f77c5d5a2cd48442ca16453460.tar nixpkgs-fbc63c4a7bcec8f77c5d5a2cd48442ca16453460.tar.gz nixpkgs-fbc63c4a7bcec8f77c5d5a2cd48442ca16453460.tar.bz2 nixpkgs-fbc63c4a7bcec8f77c5d5a2cd48442ca16453460.tar.lz nixpkgs-fbc63c4a7bcec8f77c5d5a2cd48442ca16453460.tar.xz nixpkgs-fbc63c4a7bcec8f77c5d5a2cd48442ca16453460.tar.zst nixpkgs-fbc63c4a7bcec8f77c5d5a2cd48442ca16453460.zip | |
Merge pull request #86208 from arianvp/fix-linux-systemd-dep
linux: do not depend on systemd indirectly
Diffstat (limited to 'pkgs')
| -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 71505840b86..d73e0a8ac90 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,6 +1,6 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl , libelf, cpio -, utillinux +, utillinuxMinimal , writeTextFile }: @@ -281,7 +281,7 @@ let in assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null; -assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null; +assert stdenv.lib.versionAtLeast version "4.15" -> utillinuxMinimal != null; stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // { pname = "linux"; inherit version; @@ -292,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") libelf - ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux + ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinuxMinimal ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio ; |