Skip to content

Commit

Permalink
qgis-ltr: disable PDAL support
Browse files Browse the repository at this point in the history
QGIS-LTR is failing to build with PDAL 2.6.
PDAL support can be re-enabled once
qgis/QGIS#54940
is backported.

Closes NixOS#281266 .
  • Loading branch information
imincik committed Feb 2, 2024
1 parent 05a6de1 commit e3b35b5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 138 deletions.
131 changes: 0 additions & 131 deletions pkgs/applications/gis/qgis/pdal-2_5.nix

This file was deleted.

11 changes: 4 additions & 7 deletions pkgs/applications/gis/qgis/unwrapped-ltr.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@
}:

let

# replace with global pdal version once
# https://github.com/qgis/QGIS/pull/54940 is backported
pdal = callPackage ./pdal-2_5.nix { };

py = python3.override {
packageOverrides = self: super: {
pyqt5 = super.pyqt5.override {
Expand Down Expand Up @@ -132,7 +127,7 @@ in mkDerivation rec {
qtserialport
qtxmlpatterns
qt3d
pdal
# pdal
zstd
] ++ lib.optional withGrass grass
++ lib.optional withWebKit qtwebkit
Expand All @@ -151,9 +146,11 @@ in mkDerivation rec {
})
];

# PDAL is disabled until https://github.com/qgis/QGIS/pull/54940
# is backported.
cmakeFlags = [
"-DWITH_3D=True"
"-DWITH_PDAL=TRUE"
"-DWITH_PDAL=False" # TODO: re-enable PDAL
"-DENABLE_TESTS=False"
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
++ lib.optional withGrass (let
Expand Down

0 comments on commit e3b35b5

Please sign in to comment.