diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-24 11:57:44 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-24 11:57:44 +0100 |
| commit | 78b7529ee36603182ae34354d7cbc3dcfc228317 (patch) | |
| tree | 26a9555518aa403f9328dc1a72680e823e3630de /pkgs/applications/misc/gkrellm | |
| parent | f3886a6fba7dec4d5c97a51558ab0a4489f89d76 (diff) | |
| parent | 4d4980d9f88956f533ecad905c92ab70f0e8cbad (diff) | |
| download | nixpkgs-78b7529ee36603182ae34354d7cbc3dcfc228317.tar nixpkgs-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.gz nixpkgs-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.bz2 nixpkgs-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.lz nixpkgs-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.xz nixpkgs-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.zst nixpkgs-78b7529ee36603182ae34354d7cbc3dcfc228317.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/misc/gkrellm')
| -rw-r--r-- | pkgs/applications/misc/gkrellm/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 91ba6852462..f4fec41b9e6 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE }: +{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE +, IOKit ? null }: stdenv.mkDerivation rec { name = "gkrellm-2.3.5"; @@ -7,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh"; }; - buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE]; + buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE] + ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; hardeningDisable = [ "format" ]; |