Merge branch 'master.upstream' into staging.upstream

2015-07-13 15:11:31 -07:00
parent d253b3d875 7e3c95a0b8
commit 333f145d76
178 changed files with 2917 additions and 1932 deletions
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {

  buildInputs = [ pkgconfig autoconf automake openssl libgsf gmp ];

+  patchPhase = ''
+    substituteInPlace Makefile.in \
+      --replace '-march=native' "" \
+      --replace '-mtune=native' ""
+  '';
+
  installPhase =
  ''
    mkdir -p $out/bin