diff options
| author | Lancelot SIX <lsix@lancelotsix.com> | 2021-05-25 17:31:35 +0100 |
|---|---|---|
| committer | Robert Schütz <nix@dotlambda.de> | 2021-09-26 23:11:28 -0700 |
| commit | 042eebd8d91c16fbe44186bbf33b478c9edb780b (patch) | |
| tree | 5661f10ff6ad3130448c21260dde7b464e8f5d1d /pkgs/applications/gis | |
| parent | c826ba3f6ba8c8be7a2a983d42a79f4115afeb63 (diff) | |
| download | nixpkgs-042eebd8d91c16fbe44186bbf33b478c9edb780b.tar nixpkgs-042eebd8d91c16fbe44186bbf33b478c9edb780b.tar.gz nixpkgs-042eebd8d91c16fbe44186bbf33b478c9edb780b.tar.bz2 nixpkgs-042eebd8d91c16fbe44186bbf33b478c9edb780b.tar.lz nixpkgs-042eebd8d91c16fbe44186bbf33b478c9edb780b.tar.xz nixpkgs-042eebd8d91c16fbe44186bbf33b478c9edb780b.tar.zst nixpkgs-042eebd8d91c16fbe44186bbf33b478c9edb780b.zip | |
qgis: fix build with PROJ 8
Co-authored-by: Robert Schütz <nix@dotlambda.de>
Diffstat (limited to 'pkgs/applications/gis')
| -rw-r--r-- | pkgs/applications/gis/qgis/unwrapped.nix | 55 |
1 files changed, 47 insertions, 8 deletions
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index bdd8ace1e3d..70b5ffcc707 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -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; |