htop: merge both implementations
htop 2.0+ is now cross-platform
This commit is contained in:
parent
1a7a7d8ef9
commit
d9e60e4d43
|
@ -1,21 +0,0 @@
|
|||
{ fetchurl, stdenv, ncurses, autoconf, automake, IOKit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "htop-0.8.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/max-horvath/htop-osx/archive/0.8.2.2.tar.gz";
|
||||
sha256 = "0qxibadn2lfqn10a5jmkv8r5ljfs0vaaa4j6psd7ppxa2w6bx5li";
|
||||
};
|
||||
|
||||
buildInputs = [ autoconf automake ncurses IOKit ];
|
||||
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
meta = {
|
||||
description = "An interactive process viewer for Mac OS X";
|
||||
homepage = "https://github.com/max-horvath/htop-osx";
|
||||
platforms = stdenv.lib.platforms.darwin;
|
||||
maintainers = with stdenv.lib.maintainers; [ joelteon ];
|
||||
};
|
||||
}
|
|
@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An interactive process viewer for Linux";
|
||||
homepage = http://htop.sourceforge.net;
|
||||
homepage = https://hisham.hm/htop/;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ rob simons relrod nckx ];
|
||||
};
|
||||
}
|
|
@ -10311,14 +10311,7 @@ let
|
|||
|
||||
hostapd = callPackage ../os-specific/linux/hostapd { };
|
||||
|
||||
htop =
|
||||
if stdenv.isLinux then
|
||||
callPackage ../os-specific/linux/htop { }
|
||||
else if stdenv.isDarwin then
|
||||
callPackage ../os-specific/darwin/htop {
|
||||
inherit (darwin.apple_sdk.frameworks) IOKit;
|
||||
}
|
||||
else null;
|
||||
htop = callPackage ../tools/system/htop { };
|
||||
|
||||
# GNU/Hurd core packages.
|
||||
gnu = recurseIntoAttrs (callPackage ../os-specific/gnu {
|
||||
|
|
Loading…
Reference in a new issue