Skip to content

qgis-ltr: disable PDAL support #283718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imincik merged 1 commit into from
Feb 3, 2024
Merged

qgis-ltr: disable PDAL support #283718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 0 additions & 131 deletions pkgs/applications/gis/qgis/pdal-2_5.nix
View file
Open in desktop

This file was deleted.

11 changes: 4 additions & 7 deletions pkgs/applications/gis/qgis/unwrapped-ltr.nix
View file
Open in desktop
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