Merge commit 'cb21b77' into master.upstream

This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
parent 83aeb00a78 cb21b77ff1
commit 9579c9ec7f
392 changed files with 7282 additions and 7266 deletions
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    sha256 = "10p4gf8y9h7mxkqlbs3hqgvmvbgvcbax8jp1whbw4yidwahn06w7";
  };

-  buildInputs = [ zlib openssl libiconv ];
+  buildInputs = [ zlib openssl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;

  meta = {
    homepage = "http://www.httrack.com";