Merge branch 'master' into staging

This commit is contained in:
obadz
2016-08-24 11:57:44 +01:00
46 changed files with 363 additions and 50 deletions
+4 -2
View File
@@ -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" ];