From db6dff75bd8905e7f7c7c679d5dc6680f65e5ae0 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Mon, 21 Mar 2016 14:05:01 -0500 Subject: [PATCH] htop: fix build on darwin --- pkgs/tools/system/htop/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 46547aa45fd..9301107d2db 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, ncurses }: +{ lib, fetchurl, stdenv, ncurses, +IOKit }: stdenv.mkDerivation rec { name = "htop-${version}"; @@ -9,7 +10,9 @@ stdenv.mkDerivation rec { url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz"; }; - buildInputs = [ ncurses ]; + buildInputs = + [ ncurses ] ++ + lib.optionals stdenv.isDarwin [ IOKit ]; meta = with stdenv.lib; { description = "An interactive process viewer for Linux"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da6fca3a81a..10800fbb2a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10309,7 +10309,9 @@ let hostapd = callPackage ../os-specific/linux/hostapd { }; - htop = callPackage ../tools/system/htop { }; + htop = callPackage ../tools/system/htop { + inherit (darwin) IOKit; + }; # GNU/Hurd core packages. gnu = recurseIntoAttrs (callPackage ../os-specific/gnu {