pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
|
||||
{ lib, stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
|
||||
, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
|
||||
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
|
||||
, libiconv, libxml2
|
||||
, netcdfSupport ? true, netcdf, hdf5, curl
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdal";
|
||||
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite
|
||||
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
|
||||
++ (with pythonPackages; [ python numpy wrapPython ])
|
||||
++ stdenv.lib.optional stdenv.isDarwin libiconv
|
||||
++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
|
||||
++ lib.optional stdenv.isDarwin libiconv
|
||||
++ lib.optionals netcdfSupport [ netcdf hdf5 curl ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-expat=${expat.dev}"
|
||||
@@ -97,8 +97,8 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Translator library for raster geospatial data formats";
|
||||
homepage = "https://www.gdal.org/";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
||||
platforms = with stdenv.lib.platforms; linux ++ darwin;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.marcweber ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql
|
||||
, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl, libpng
|
||||
, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat, libiconv, libxml2
|
||||
, autoreconfHook, netcdfSupport ? true, netcdf, hdf5, curl, pkg-config }:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdal";
|
||||
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
|
||||
libxml2
|
||||
postgresql
|
||||
] ++ (with pythonPackages; [ python numpy wrapPython ])
|
||||
++ stdenv.lib.optional stdenv.isDarwin libiconv
|
||||
++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
|
||||
++ lib.optional stdenv.isDarwin libiconv
|
||||
++ lib.optionals netcdfSupport [ netcdf hdf5 curl ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-expat=${expat.dev}"
|
||||
@@ -87,8 +87,8 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Translator library for raster geospatial data formats";
|
||||
homepage = "https://www.gdal.org/";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
||||
platforms = with stdenv.lib.platforms; linux ++ darwin;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.marcweber ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
|
||||
{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
|
||||
, postgresql, mysql57, libgeotiff, python, pythonPackages, proj, geos, openssl
|
||||
, libpng }:
|
||||
|
||||
@@ -59,8 +59,8 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Translator library for raster geospatial data formats";
|
||||
homepage = "https://www.gdal.org/";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
||||
platforms = with stdenv.lib.platforms; linux ++ darwin;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.marcweber ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user