diff options
| author | Nikolay Korotkiy <sikmir@disroot.org> | 2023-01-04 00:19:50 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-04 00:19:50 +0400 |
| commit | 12461da090cd1cb813c71d3d0c0c915e3f4c6e9d (patch) | |
| tree | 87f0ff6e6ed599abf334910b47c6276bfb888fab /pkgs/applications/gis | |
| parent | 918ce50eae45f766fc35a2feabfd4c85b5131e5f (diff) | |
| parent | bba45f07cede2b65ce4f49708cb362f6e1ec229f (diff) | |
| download | nixlib-12461da090cd1cb813c71d3d0c0c915e3f4c6e9d.tar nixlib-12461da090cd1cb813c71d3d0c0c915e3f4c6e9d.tar.gz nixlib-12461da090cd1cb813c71d3d0c0c915e3f4c6e9d.tar.bz2 nixlib-12461da090cd1cb813c71d3d0c0c915e3f4c6e9d.tar.lz nixlib-12461da090cd1cb813c71d3d0c0c915e3f4c6e9d.tar.xz nixlib-12461da090cd1cb813c71d3d0c0c915e3f4c6e9d.tar.zst nixlib-12461da090cd1cb813c71d3d0c0c915e3f4c6e9d.zip | |
Merge pull request #208692 from hqurve/qgis
qgis, qgis-ltr: disable qtwebkit by default and correctly link grass
Diffstat (limited to 'pkgs/applications/gis')
| -rw-r--r-- | pkgs/applications/gis/qgis/unwrapped-ltr.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/gis/qgis/unwrapped.nix | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index e11df27ab6c3..5e35e56fe5fe 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -28,11 +28,12 @@ , qtkeychain , qt3d , qscintilla +, qtlocation , qtserialport , qtxmlpatterns , withGrass ? true , grass -, withWebKit ? true +, withWebKit ? false , qtwebkit , pdal , zstd @@ -109,6 +110,7 @@ in mkDerivation rec { qca-qt5 qtkeychain qscintilla + qtlocation qtserialport qtxmlpatterns qt3d @@ -132,7 +134,11 @@ in mkDerivation rec { "-DWITH_3D=True" "-DWITH_PDAL=TRUE" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + ++ lib.optional withGrass (let + gmajor = lib.versions.major grass.version; + gminor = lib.versions.minor grass.version; + in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" + ); dontWrapGApps = true; # wrapper params passed below diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 9f445facb167..929a40d6daab 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -28,11 +28,12 @@ , qtkeychain , qt3d , qscintilla +, qtlocation , qtserialport , qtxmlpatterns , withGrass ? true , grass -, withWebKit ? true +, withWebKit ? false , qtwebkit , pdal , zstd @@ -109,6 +110,7 @@ in mkDerivation rec { qca-qt5 qtkeychain qscintilla + qtlocation qtserialport qtxmlpatterns qt3d @@ -132,7 +134,11 @@ in mkDerivation rec { "-DWITH_3D=True" "-DWITH_PDAL=TRUE" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + ++ lib.optional withGrass (let + gmajor = lib.versions.major grass.version; + gminor = lib.versions.minor grass.version; + in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" + ); dontWrapGApps = true; # wrapper params passed below |