From 18504037c5f088ae8fb45c712da1b252ff992d4c Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Thu, 23 Apr 2020 13:49:27 +0200 Subject: [PATCH] inxi: Add a flag to install all recommended tools --- pkgs/tools/system/inxi/default.nix | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index c1697e375e01..364565016185 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -1,6 +1,26 @@ -{ stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper +, ps, dnsutils # dig is recommended for multiple categories +, withRecommends ? false # Install (almost) all recommended tools (see --recommends) +, withRecommendedSystemPrograms ? withRecommends, utillinuxMinimal, dmidecode +, file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools +, binutils, tree, upower +, withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg +}: -stdenv.mkDerivation rec { +let + prefixPath = programs: + "--prefix PATH ':' '${stdenv.lib.makeBinPath programs}'"; + recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [ + utillinuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod + lm_sensors smartmontools binutils tree upower + ]; + recommendedDisplayInformationPrograms = lib.optionals + withRecommendedDisplayInformationPrograms + ([ glxinfo ] ++ (with xorg; [ xdpyinfo xprop xrandr ])); + programs = [ ps dnsutils ] # Core programs + ++ recommendedSystemPrograms + ++ recommendedDisplayInformationPrograms; +in stdenv.mkDerivation rec { pname = "inxi"; version = "3.1.00-1"; @@ -17,7 +37,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp inxi $out/bin/ wrapProgram $out/bin/inxi \ - --set PERL5LIB "${perlPackages.makePerlPath (with perlPackages; [ CpanelJSONXS ])}" + --set PERL5LIB "${perlPackages.makePerlPath (with perlPackages; [ CpanelJSONXS ])}" \ + ${prefixPath programs} mkdir -p $out/share/man/man1 cp inxi.1 $out/share/man/man1/ '';