From de93795b4655bb9d7fab75290474f584ce67582d Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 1 Aug 2022 22:56:09 +0300 Subject: [PATCH] make-initrd-ng: clean up a bit --- pkgs/build-support/kernel/make-initrd-ng.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/kernel/make-initrd-ng.nix b/pkgs/build-support/kernel/make-initrd-ng.nix index 23ed9f3f74e0..e762464fc489 100644 --- a/pkgs/build-support/kernel/make-initrd-ng.nix +++ b/pkgs/build-support/kernel/make-initrd-ng.nix @@ -8,7 +8,7 @@ let # compression type and filename extension. compressorName = fullCommand: builtins.elemAt (builtins.match "([^ ]*/)?([^ ]+).*" fullCommand) 1; in -{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, patchelf, binutils, runCommand +{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, binutils, runCommand # Name of the derivation (not of the resulting file!) , name ? "initrd" @@ -74,10 +74,9 @@ in passAsFile = ["contents"]; contents = lib.concatMapStringsSep "\n" ({ object, symlink, ... }: "${object}\n${if symlink == null then "" else symlink}") contents + "\n"; - nativeBuildInputs = [makeInitrdNGTool patchelf cpio] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils; + nativeBuildInputs = [makeInitrdNGTool cpio] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils; -} // lib.optionalAttrs strip { - STRIP = "${(binutils.nativeDrv or binutils).targetPrefix}strip"; + STRIP = if strip then "${(binutils.nativeDrv or binutils).targetPrefix}strip" else null; }) '' mkdir ./root make-initrd-ng "$contentsPath" ./root