jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14065 from zimbatm/htop-crossplatform

Browse Source 
htop: merge both implementations
This commit is contained in:
Arseniy Seroka 2016-03-20 21:55:00 +03:00
commit 84ba149e79
3 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/os-specific/darwin/htop/default.nix
View File

@ -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 ];
};
}

4
pkgs/os-specific/linux/htop/default.nix → pkgs/tools/system/htop/default.nix
View File

@ -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 ];
};
}

9
pkgs/top-level/all-packages.nix
View File

@ -10307,14 +10307,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 {