treewide: cmake buildInputs to nativeBuildInputs, minor cleanups

2021-01-01 11:52:33 +07:00
parent 54ab07c1fe
commit b04fc593e7
212 changed files with 611 additions and 634 deletions
@@ -23,9 +23,8 @@ stdenv.mkDerivation rec {
    substituteInPlace "src/grib_jasper_encoding.c" --replace "image.inmem_    = 1;" ""
  '';

-  buildInputs = [ cmake
-                  netcdf
-                  gfortran
+  nativeBuildInputs = [ cmake gfortran ];
+  buildInputs = [ netcdf
                  libpng
                  openjpeg
                ] ++ stdenv.lib.optionals enablePython [
@@ -42,8 +41,6 @@ stdenv.mkDerivation rec {
                 "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/${openjpeg.incDir}"
               ];

-  enableParallelBuilding = true;
-
  doCheck = true;

  # Only do tests that don't require downloading 120MB of testdata