diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/system/htop/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/system/htop/default.nix | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/tools/system/htop/default.nix b/nixpkgs/pkgs/tools/system/htop/default.nix index 7e1d64942d57..215818862cdb 100644 --- a/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/nixpkgs/pkgs/tools/system/htop/default.nix @@ -1,40 +1,49 @@ -{ lib, fetchFromGitHub, stdenv, autoreconfHook +{ lib, fetchFromGitHub, stdenv, autoreconfHook, pkg-config , ncurses , IOKit +, libcap +, libnl , sensorsSupport ? stdenv.isLinux, lm_sensors -, systemdSupport ? stdenv.isLinux, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: assert systemdSupport -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "htop"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "sha256-MwtsvdPHcUdegsYj9NGyded5XJQxXri1IM1j4gef1Xk="; + sha256 = "sha256-OrlNE1A71q4XAauYNfumV1Ev1wBpFIBxPiw7aF++yjM="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ] + ++ lib.optional stdenv.isLinux pkg-config + ; buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin IOKit + ++ lib.optionals stdenv.isLinux [ libcap libnl ] ++ lib.optional sensorsSupport lm_sensors ++ lib.optional systemdSupport systemd ; configureFlags = [ "--enable-unicode" "--sysconfdir=/etc" ] + ++ lib.optionals stdenv.isLinux [ + "--enable-affinity" + "--enable-capabilities" + "--enable-delayacct" + ] ++ lib.optional sensorsSupport "--with-sensors" ; postFixup = let optionalPatch = pred: so: lib.optionalString pred "patchelf --add-needed ${so} $out/bin/htop"; - in - '' + in lib.optionalString (!stdenv.hostPlatform.isStatic) '' ${optionalPatch sensorsSupport "${lm_sensors}/lib/libsensors.so"} ${optionalPatch systemdSupport "${systemd}/lib/libsystemd.so"} ''; |