b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #208692 from hqurve/qgis

Browse source 
qgis, qgis-ltr: disable qtwebkit by default and correctly link grass
This commit is contained in:
Nikolay Korotkiy 2023-01-04 00:19:50 +04:00 committed by GitHub
parent 918ce50eae bba45f07ce
commit 12461da090
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/gis/qgis/unwrapped-ltr.nix
View file

@ -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

10
pkgs/applications/gis/qgis/unwrapped.nix
View file

@ -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