Unverified Commit c6d0ee12 authored by Luke Granger-Brown's avatar Luke Granger-Brown Committed by GitHub
Browse files

Merge pull request #218675 from lukegb/issue218456 

netcdf-cxx4: during tests, use netcdf's installed plugins
parents eef1defa de8e79c9

pkgs/development/libraries/netcdf-cxx4/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -17,10 +17,11 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [ cmake ninja ];

  buildInputs = [ netcdf hdf5 curl ];



  # 10 - cxx4_test_filter (Failed)

  # Setting Filter....Caught unexpected exception.

  doCheck = false;

  doCheck = true;

  enableParallelChecking = false;

  preCheck = ''

    export HDF5_PLUGIN_PATH=${netcdf}/lib/hdf5-plugins

  '';



  meta = {

    description = "C++ API to manipulate netcdf files";

pkgs/development/libraries/netcdf/default.nix

+12 −1
Original line number Diff line number Diff line 
{ lib, stdenv

, fetchurl, unzip

, hdf5

, bzip2

, libzip

, zstd

, szipSupport ? false

, szip

, libxml2

, m4

, curl # for DAP
@@ -34,7 +39,10 @@ in stdenv.mkDerivation rec { 
    hdf5

    libxml2

    mpi

  ];

    bzip2

    libzip

    zstd

  ] ++ lib.optional szipSupport szip;



  passthru = {

    inherit mpiSupport mpi;
@@ -45,9 +53,12 @@ in stdenv.mkDerivation rec { 
      "--enable-dap"

      "--enable-shared"

      "--disable-dap-remote-tests"

      "--with-plugin-dir=${placeholder "out"}/lib/hdf5-plugins"

  ]

  ++ (lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]);



  enableParallelBuilding = true;



  disallowedReferences = [ stdenv.cc ];



  postFixup = ''