treewide: stdenv.lib -> lib
This commit is contained in:
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
name = "grass";
|
||||
version = "7.6.1";
|
||||
|
||||
src = with stdenv.lib; fetchFromGitHub {
|
||||
src = with lib; fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "grass";
|
||||
rev = "${name}_${replaceStrings ["."] ["_"] version}";
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
# Otherwise a very confusing "Can't load GDAL library" error
|
||||
makeFlags = stdenv.lib.optional stdenv.isDarwin "GDAL_DYNAMIC=";
|
||||
makeFlags = lib.optional stdenv.isDarwin "GDAL_DYNAMIC=";
|
||||
|
||||
/* Ensures that the python script run at build time are actually executable;
|
||||
* otherwise, patchShebangs ignores them. */
|
||||
@@ -103,8 +103,8 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = "https://grass.osgeo.org/";
|
||||
description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = with stdenv.lib.maintainers; [mpickering];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [mpickering];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ mkDerivation rec {
|
||||
# See https://github.com/NixOS/nixpkgs/issues/85306
|
||||
"-DLICENSING_PROVIDER:BOOL=OFF"
|
||||
"-DMapper_MANUAL_QTHELP:BOOL=OFF"
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# FindGDAL is broken and always finds /Library/Framework unless this is
|
||||
# specified
|
||||
"-DGDAL_INCLUDE_DIR=${gdal}/include"
|
||||
|
||||
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "0s5byn8qyi1bm59j9vhwqaygw5cxipc7wbd3flh7n24nx0s8pr8c";
|
||||
};
|
||||
|
||||
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
cargoSha256 = "09rz8f1xyc64qjbj6pgw8jxr2a7chghmdc6sfkbv7hdvx6vg4wvk";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user