qgis: fix build with PROJ 8
Co-authored-by: Robert Schütz <nix@dotlambda.de>
This commit is contained in:
parent
c826ba3f6b
commit
042eebd8d9
|
@ -1,9 +1,42 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos
|
||||
, xlibsWrapper, sqlite, gsl, qwt, fcgi, python3Packages, libspatialindex
|
||||
, libspatialite, postgresql, txt2tags, openssl, libzip, hdf5, netcdf, exiv2
|
||||
, protobuf, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport
|
||||
, qtxmlpatterns, withGrass ? true, grass, withWebKit ? true, qtwebkit }:
|
||||
with lib;
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, ninja
|
||||
, flex
|
||||
, bison
|
||||
, proj
|
||||
, geos
|
||||
, xlibsWrapper
|
||||
, sqlite
|
||||
, gsl
|
||||
, qwt
|
||||
, fcgi
|
||||
, python3Packages
|
||||
, libspatialindex
|
||||
, libspatialite
|
||||
, postgresql
|
||||
, txt2tags
|
||||
, openssl
|
||||
, libzip
|
||||
, hdf5
|
||||
, netcdf
|
||||
, exiv2
|
||||
, protobuf
|
||||
, qtbase
|
||||
, qtsensors
|
||||
, qca-qt5
|
||||
, qtkeychain
|
||||
, qscintilla
|
||||
, qtserialport
|
||||
, qtxmlpatterns
|
||||
, withGrass ? true
|
||||
, grass
|
||||
, withWebKit ? true
|
||||
, qtwebkit
|
||||
}:
|
||||
|
||||
let
|
||||
pythonBuildInputs = with python3Packages; [
|
||||
qscintilla-qt5
|
||||
|
@ -25,8 +58,7 @@ let
|
|||
];
|
||||
in mkDerivation rec {
|
||||
version = "3.16.10";
|
||||
pname = "qgis";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
pname = "qgis-unwrapped";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qgis";
|
||||
|
@ -35,6 +67,13 @@ in mkDerivation rec {
|
|||
sha256 = "sha256-/lsfyTDlkZNIVHg5qgZW7qfOyTC2+1r3ZbsnQmEdy30=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qgis/QGIS/commit/fc1ac8bef8dcc3194857ecd32519aca4867b4fa1.patch";
|
||||
sha256 = "106smg3drx8c7yxzfhd1c7xrq757l5cfxx8lklihyvr4a7wc9gpy";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit pythonBuildInputs;
|
||||
inherit python3Packages;
|
||||
|
|
Loading…
Reference in a new issue