diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-08-30 23:55:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-30 23:55:22 +0200 |
commit | 1f52d286b92d35b9654405aa3804297d8b03425b (patch) | |
tree | ea6c40fec056d0da339f345d37ec1487a27ae7a1 /pkgs/applications/gis | |
parent | 2798a602a4e28a174fb6f1bdfc5d5fdc2c6c31eb (diff) | |
parent | a791f731e345efff318eb270d5cab1bb4d1273f8 (diff) | |
download | nixlib-1f52d286b92d35b9654405aa3804297d8b03425b.tar nixlib-1f52d286b92d35b9654405aa3804297d8b03425b.tar.gz nixlib-1f52d286b92d35b9654405aa3804297d8b03425b.tar.bz2 nixlib-1f52d286b92d35b9654405aa3804297d8b03425b.tar.lz nixlib-1f52d286b92d35b9654405aa3804297d8b03425b.tar.xz nixlib-1f52d286b92d35b9654405aa3804297d8b03425b.tar.zst nixlib-1f52d286b92d35b9654405aa3804297d8b03425b.zip |
Merge pull request #251641 from imincik/qgis-ltr-3.38.10
qgis-ltr: 3.28.7 -> 3.28.10
Diffstat (limited to 'pkgs/applications/gis')
-rw-r--r-- | pkgs/applications/gis/qgis/ltr.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/gis/qgis/unwrapped-ltr.nix | 93 |
2 files changed, 61 insertions, 44 deletions
diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix index d34e1e69833b..9288f6ee607e 100644 --- a/pkgs/applications/gis/qgis/ltr.nix +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -1,8 +1,11 @@ -{ lib, makeWrapper, symlinkJoin +{ lib +, makeWrapper +, symlinkJoin + , extraPythonPackages ? (ps: [ ]) + , libsForQt5 }: -with lib; let qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix { }; in symlinkJoin rec { @@ -12,7 +15,10 @@ in symlinkJoin rec { paths = [ qgis-ltr-unwrapped ]; - nativeBuildInputs = [ makeWrapper qgis-ltr-unwrapped.py.pkgs.wrapPython ]; + nativeBuildInputs = [ + makeWrapper + qgis-ltr-unwrapped.py.pkgs.wrapPython + ]; # extend to add to the python environment of QGIS without rebuilding QGIS application. pythonInputs = qgis-ltr-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-ltr-unwrapped.py.pkgs); diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index b69078afe314..71b0030dba78 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -1,45 +1,47 @@ { lib -, mkDerivation , fetchFromGitHub +, makeWrapper +, mkDerivation +, substituteAll +, wrapGAppsHook + +, withGrass ? true +, withWebKit ? false + +, bison , cmake -, ninja +, exiv2 +, fcgi , flex -, bison -, proj , geos -, sqlite +, grass , gsl -, qwt -, fcgi -, python3 +, hdf5 , libspatialindex , libspatialite -, postgresql -, txt2tags -, openssl , libzip -, hdf5 , netcdf -, exiv2 +, ninja +, openssl +, pdal +, postgresql +, proj , protobuf -, qtbase -, qtsensors +, python3 , qca-qt5 -, qtkeychain -, qt3d , qscintilla +, qt3d +, qtbase +, qtkeychain , qtlocation +, qtsensors , qtserialport -, qtxmlpatterns -, withGrass ? true -, grass -, withWebKit ? false , qtwebkit -, pdal +, qtxmlpatterns +, qwt +, sqlite +, txt2tags , zstd -, makeWrapper -, wrapGAppsHook -, substituteAll }: let @@ -53,34 +55,34 @@ let }; pythonBuildInputs = with py.pkgs; [ - qscintilla-qt5 + chardet gdal jinja2 numpy + owslib psycopg2 - chardet + pygments + pyqt-builder + pyqt5 python-dateutil - pyyaml pytz + pyyaml + qscintilla-qt5 requests - urllib3 - pygments - pyqt5 - pyqt-builder - sip setuptools - owslib + sip six + urllib3 ]; in mkDerivation rec { - version = "3.28.7"; + version = "3.28.10"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-RWQ3RlE8fPMuDGosxKNVgbjRTigZRolqNyaJoC1xdec="; + hash = "sha256-5TGcXYfOJonpqecV59dhFcl4rNXbBSofdoTz5o5FFcc="; }; passthru = { @@ -88,6 +90,16 @@ in mkDerivation rec { inherit py; }; + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + + bison + cmake + flex + ninja + ]; + buildInputs = [ openssl proj @@ -120,8 +132,6 @@ in mkDerivation rec { ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; - nativeBuildInputs = [ makeWrapper wrapGAppsHook cmake flex bison ninja ]; - patches = [ (substituteAll { src = ./set-pyqt-package-dirs-ltr.patch; @@ -133,6 +143,7 @@ in mkDerivation rec { cmakeFlags = [ "-DWITH_3D=True" "-DWITH_PDAL=TRUE" + "-DENABLE_TESTS=False" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass (let gmajor = lib.versions.major grass.version; @@ -143,10 +154,10 @@ in mkDerivation rec { dontWrapGApps = true; # wrapper params passed below postFixup = lib.optionalString withGrass '' - # grass has to be availble on the command line even though we baked in + # GRASS has to be availble on the command line even though we baked in # the path at build time using GRASS_PREFIX. - # using wrapGAppsHook also prevents file dialogs from crashing the program - # on non-NixOS + # Using wrapGAppsHook also prevents file dialogs from crashing the program + # on non-NixOS. wrapProgram $out/bin/qgis \ "''${gappsWrapperArgs[@]}" \ --prefix PATH : ${lib.makeBinPath [ grass ]} |