Merge remote-tracking branch 'upstream/master' into staging

2016-10-02 10:36:47 +03:00
parent 97bfc2fac9 a387a5d870
commit 19225bf5cc
223 changed files with 8339 additions and 5811 deletions
@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
    sha256 = "1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f";
  };

-  buildInputs = stdenv.lib.optional (!stdenv.isDarwin) [ patchelf ];
-
  # For some reason (probably a build system bug), the binary isn't
  # properly linked to $out/lib to find libfuzzy.so
  postFixup = stdenv.lib.optionalString (!stdenv.isDarwin) ''