From 6e8889d4aee2d8ec7ab296836eb4be4b96c785e8 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Fri, 10 Feb 2023 13:35:49 -0500 Subject: [PATCH] dracut: reduce closure and suffix DRACUT_PATH Implements a few usability changes for dracut framework by suffixing rather than prefixing `DRACUT_PATH` (so that downstream consumers can more easily override it) and reduce closure size by bundling fewer default utilities in `DRACUT_PATH`. Done per comments at https://github.com/NixOS/nixpkgs/pull/210075#discussion_r1088822274. --- pkgs/os-specific/linux/dracut/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/os-specific/linux/dracut/default.nix b/pkgs/os-specific/linux/dracut/default.nix index 583bd4115ac5..c6bf684f7fc8 100644 --- a/pkgs/os-specific/linux/dracut/default.nix +++ b/pkgs/os-specific/linux/dracut/default.nix @@ -10,24 +10,17 @@ , bash , kmod , binutils -, busybox , bzip2 , coreutils , cpio , findutils -, glibc , gnugrep , gnused , gnutar , gzip -, kbd -, lvm2 , lz4 , lzop -, procps -, rng-tools , squashfsTools -, systemd , util-linux , xz , zstd @@ -76,23 +69,16 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/dracut --prefix PATH : ${lib.makeBinPath [ coreutils util-linux - ]} --prefix DRACUT_PATH : ${lib.makeBinPath [ + ]} --suffix DRACUT_PATH : ${lib.makeBinPath [ bash binutils coreutils findutils - glibc gnugrep gnused gnutar - kbd - lvm2 - procps - rng-tools - squashfsTools - systemd + stdenv.cc.libc # for ldd command util-linux - busybox ]} wrapProgram $out/bin/dracut-catimages --set PATH ${lib.makeBinPath [ coreutils