Merge branch 'master' into staging-next

2020-08-23 02:00:50 +02:00
parent 4cf394ea3f ddfa221670
commit 91104b5417
417 changed files with 14414 additions and 8866 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, cmake }:

 stdenv.mkDerivation rec {
  pname = "lzfse";
@@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "1mfh6y6vpvxsdwmqmfbkqkwvxc0pz2dqqc72c6fk9sbsrxxaghd5";
  };

-  makeFlags = [ "INSTALL_PREFIX=$(out)" ];
-
-  enableParallelBuilding = false; #bug
+  nativeBuildInputs = [ cmake ];

  meta = with stdenv.lib; {
    homepage = "https://github.com/lzfse/lzfse";