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

2018-02-26 10:50:18 +01:00
parent 6b381d4c9b 1d6abdd177
commit 4f08b0fbac
757 changed files with 5494 additions and 5077 deletions
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
    sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437";
  };

-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    attr acl zlib libuuid e2fsprogs lzo
-    asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt zstd
+  nativeBuildInputs = [
+    pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
  ];

+  buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd ];
+
  # gcc bug with -O1 on ARM with gcc 4.8
  # This should be fine on all platforms so apply universally
  patchPhase = "sed -i s/-O1/-O2/ configure";