qgis: fix build with PROJ 8

Co-authored-by: Robert Schütz <nix@dotlambda.de>

authored by

Lancelot SIX
Robert Schütz
and committed by
Robert Schütz
042eebd8 c826ba3f

+47 -8
+47 -8
pkgs/applications/gis/qgis/unwrapped.nix
··· 1 - { mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos 2 - , xlibsWrapper, sqlite, gsl, qwt, fcgi, python3Packages, libspatialindex 3 - , libspatialite, postgresql, txt2tags, openssl, libzip, hdf5, netcdf, exiv2 4 - , protobuf, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport 5 - , qtxmlpatterns, withGrass ? true, grass, withWebKit ? true, qtwebkit }: 6 - with lib; 1 + { lib 2 + , mkDerivation 3 + , fetchFromGitHub 4 + , fetchpatch 5 + , cmake 6 + , ninja 7 + , flex 8 + , bison 9 + , proj 10 + , geos 11 + , xlibsWrapper 12 + , sqlite 13 + , gsl 14 + , qwt 15 + , fcgi 16 + , python3Packages 17 + , libspatialindex 18 + , libspatialite 19 + , postgresql 20 + , txt2tags 21 + , openssl 22 + , libzip 23 + , hdf5 24 + , netcdf 25 + , exiv2 26 + , protobuf 27 + , qtbase 28 + , qtsensors 29 + , qca-qt5 30 + , qtkeychain 31 + , qscintilla 32 + , qtserialport 33 + , qtxmlpatterns 34 + , withGrass ? true 35 + , grass 36 + , withWebKit ? true 37 + , qtwebkit 38 + }: 39 + 7 40 let 8 41 pythonBuildInputs = with python3Packages; [ 9 42 qscintilla-qt5 ··· 25 58 ]; 26 59 in mkDerivation rec { 27 60 version = "3.16.10"; 28 - pname = "qgis"; 29 - name = "${pname}-unwrapped-${version}"; 61 + pname = "qgis-unwrapped"; 30 62 31 63 src = fetchFromGitHub { 32 64 owner = "qgis"; ··· 34 66 rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; 35 67 sha256 = "sha256-/lsfyTDlkZNIVHg5qgZW7qfOyTC2+1r3ZbsnQmEdy30="; 36 68 }; 69 + 70 + patches = [ 71 + (fetchpatch { 72 + url = "https://github.com/qgis/QGIS/commit/fc1ac8bef8dcc3194857ecd32519aca4867b4fa1.patch"; 73 + sha256 = "106smg3drx8c7yxzfhd1c7xrq757l5cfxx8lklihyvr4a7wc9gpy"; 74 + }) 75 + ]; 37 76 38 77 passthru = { 39 78 inherit pythonBuildInputs;