Merge commit '2e56ba' from staging into master

2018-01-17 12:50:46 +02:00
parent 5ab499d2c7 2e56ba6fbd
commit 67c73b4e64
97 changed files with 231 additions and 305 deletions
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -21,10 +21,6 @@ stdenv.mkDerivation rec {
  # and the wonderful bazel BUILD file is already there (yay case-insensitivity?)
  prePatch = "rm BUILD";

-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
-    cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$lib/lib")
-  '';
-
  meta = with stdenv.lib; {
    inherit (src.meta) homepage;