pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,4 +1,4 @@
|
||||
{ fetchurl, fetchpatch, stdenv,
|
||||
{ fetchurl, fetchpatch, lib, stdenv,
|
||||
cmake, netcdf, gfortran, libpng, openjpeg,
|
||||
enablePython ? false, pythonPackages }:
|
||||
|
||||
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ netcdf
|
||||
libpng
|
||||
openjpeg
|
||||
] ++ stdenv.lib.optionals enablePython [
|
||||
] ++ lib.optionals enablePython [
|
||||
pythonPackages.python
|
||||
];
|
||||
|
||||
propagatedBuildInputs = stdenv.lib.optionals enablePython [
|
||||
propagatedBuildInputs = lib.optionals enablePython [
|
||||
pythonPackages.numpy
|
||||
];
|
||||
|
||||
@@ -46,14 +46,14 @@ stdenv.mkDerivation rec {
|
||||
# Only do tests that don't require downloading 120MB of testdata
|
||||
# We fix the darwin checkPhase, which searches for libgrib_api.dylib
|
||||
# in /nix/store by setting DYLD_LIBRARY_PATH
|
||||
checkPhase = stdenv.lib.optionalString (stdenv.isDarwin) ''
|
||||
checkPhase = lib.optionalString (stdenv.isDarwin) ''
|
||||
substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib"
|
||||
'' + ''
|
||||
ctest -R "t_definitions|t_calendar|t_unit_tests" -VV
|
||||
'';
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home";
|
||||
license = licenses.asl20;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
|
||||
Reference in New Issue
Block a user