qgis-ltr: 3.16.16 -> 3.22.4

This commit is contained in:
Will Cohen 2022-02-18 10:22:43 -05:00 committed by Kerstin
parent 2448f4dd45
commit 9f27578b40

View File

@ -35,6 +35,8 @@
, grass , grass
, withWebKit ? true , withWebKit ? true
, qtwebkit , qtwebkit
, pdal
, zstd
, makeWrapper , makeWrapper
}: }:
@ -67,14 +69,14 @@ let
six six
]; ];
in mkDerivation rec { in mkDerivation rec {
version = "3.16.16"; version = "3.22.4";
pname = "qgis-ltr-unwrapped"; pname = "qgis-ltr-unwrapped";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qgis"; owner = "qgis";
repo = "QGIS"; repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "85RlV1Ik1BeN9B7UE51ktTWMiGkMga2E/fnhyiVwjIs="; sha256 = "sha256-z2dCdaIJUKpZgJHtn1/qA07uMJpAWKL0cDx6B/n1Oxg=";
}; };
passthru = { passthru = {
@ -108,6 +110,8 @@ in mkDerivation rec {
qtserialport qtserialport
qtxmlpatterns qtxmlpatterns
qt3d qt3d
pdal
zstd
] ++ lib.optional withGrass grass ] ++ lib.optional withGrass grass
++ lib.optional withWebKit qtwebkit ++ lib.optional withWebKit qtwebkit
++ pythonBuildInputs; ++ pythonBuildInputs;
@ -126,6 +130,7 @@ in mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DWITH_3D=True" "-DWITH_3D=True"
"-DWITH_PDAL=TRUE"
"-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" "-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"
"-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" "-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
@ -138,11 +143,11 @@ in mkDerivation rec {
--prefix PATH : ${lib.makeBinPath [ grass ]} --prefix PATH : ${lib.makeBinPath [ grass ]}
''; '';
meta = with lib; { meta = {
description = "A Free and Open Source Geographic Information System"; description = "A Free and Open Source Geographic Information System";
homepage = "https://www.qgis.org"; homepage = "https://www.qgis.org";
license = licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
platforms = platforms.linux; platforms = with lib.platforms; linux;
maintainers = with maintainers; [ lsix sikmir erictapen ]; maintainers = with lib.maintainers; [ lsix sikmir erictapen ];
}; };
} }