git.iko.soy/typeable/nixpkgs
on master help sign in
qgis: fix build with PROJ 8

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

commit042eebd8d91c16fbe44186bbf33b478c9edb780b authorLancelot SIX <lsix@lancelotsix.com> dateTue 25 May 2021, 17:31 (5 years ago) parentc826ba3
1 file changed+47−8
pkgs/applications/gis/qgis/unwrapped.nix+47−8
pkgs/applications/gis/qgis/unwrapped.nix+47−8
@@ -1,9 +1,42 @@
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+
740let
841 pythonBuildInputs = with python3Packages; [
942 qscintilla-qt5
@@ -25,8 +58,7 @@ let
2558 ];
2659in mkDerivation rec {
2760 version = "3.16.10";
28− pname = "qgis";
29− name = "${pname}-unwrapped-${version}";
61+ pname = "qgis-unwrapped";
3062
3163 src = fetchFromGitHub {
3264 owner = "qgis";
@@ -35,6 +67,13 @@ in mkDerivation rec {
3567 sha256 = "sha256-/lsfyTDlkZNIVHg5qgZW7qfOyTC2+1r3ZbsnQmEdy30=";
3668 };
3769
70+ patches = [
71+ (fetchpatch {
72+ url = "https://github.com/qgis/QGIS/commit/fc1ac8bef8dcc3194857ecd32519aca4867b4fa1.patch";
73+ sha256 = "106smg3drx8c7yxzfhd1c7xrq757l5cfxx8lklihyvr4a7wc9gpy";
74+ })
75+ ];
76+
3877 passthru = {
3978 inherit pythonBuildInputs;
4079 inherit python3Packages;