tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

grass: 8.2.0 -> 8.2.1. Fixes build failure.

See build failure at:
https://github.com/NixOS/nixpkgs/pull/215960#issuecomment-1568854089

Niklas Hambüchen 01e8760d 9232113f

+5 -3
unified split
+5 -3
pkgs/applications/gis/grass/default.nix
··· 6 7 stdenv.mkDerivation rec { 8 pname = "grass"; 9 - version = "8.2.0"; 10 11 src = with lib; fetchFromGitHub { 12 owner = "OSGeo"; 13 repo = "grass"; 14 rev = version; 15 - sha256 = "sha256-VK9FCqIwHGmeJe5lk12lpAGcsC1aPRBiI+XjACXjDd4="; 16 }; 17 18 nativeBuildInputs = [ 19 pkg-config bison flex makeWrapper wrapGAppsHook 20 - gdal geos libmysqlclient netcdf pdal 21 ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]); 22 23 buildInputs = [ 24 cairo zlib proj libtiff libpng fftw sqlite 25 readline ffmpeg postgresql blas wxGTK32 26 proj-datumgrid zstd 27 ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; 28 29 strictDeps = true;
··· 6 7 stdenv.mkDerivation rec { 8 pname = "grass"; 9 + version = "8.2.1"; 10 11 src = with lib; fetchFromGitHub { 12 owner = "OSGeo"; 13 repo = "grass"; 14 rev = version; 15 + hash = "sha256-U3PQd3u9i+9Bc7BSd0gK8Ss+iV9BT1xLBDrKydtl3Qk="; 16 }; 17 18 nativeBuildInputs = [ 19 pkg-config bison flex makeWrapper wrapGAppsHook 20 + gdal geos libmysqlclient netcdf 21 + pdal # for `pdal-config`; remove with next version, see https://github.com/OSGeo/grass/pull/2851 22 ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]); 23 24 buildInputs = [ 25 cairo zlib proj libtiff libpng fftw sqlite 26 readline ffmpeg postgresql blas wxGTK32 27 proj-datumgrid zstd 28 + pdal 29 ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; 30 31 strictDeps = true;