nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 01:24:47 +00:00
Code Issues 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
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 , qtkeychain
, qt3d , qt3d
, qscintilla , qscintilla
, qtlocation
, qtserialport , qtserialport
, qtxmlpatterns , qtxmlpatterns
, withGrass ? true , withGrass ? true
, grass , grass
, withWebKit ? true , withWebKit ? false
, qtwebkit , qtwebkit
, pdal , pdal
, zstd , zstd
@ -109,6 +110,7 @@ in mkDerivation rec {
qca-qt5 qca-qt5
qtkeychain qtkeychain
qscintilla qscintilla
qtlocation
qtserialport qtserialport
qtxmlpatterns qtxmlpatterns
qt3d qt3d
@ -132,7 +134,11 @@ in mkDerivation rec {
"-DWITH_3D=True" "-DWITH_3D=True"
"-DWITH_PDAL=TRUE" "-DWITH_PDAL=TRUE"
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ] ++ 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 dontWrapGApps = true; # wrapper params passed below

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

@ -28,11 +28,12 @@
, qtkeychain , qtkeychain
, qt3d , qt3d
, qscintilla , qscintilla
, qtlocation
, qtserialport , qtserialport
, qtxmlpatterns , qtxmlpatterns
, withGrass ? true , withGrass ? true
, grass , grass
, withWebKit ? true , withWebKit ? false
, qtwebkit , qtwebkit
, pdal , pdal
, zstd , zstd
@ -109,6 +110,7 @@ in mkDerivation rec {
qca-qt5 qca-qt5
qtkeychain qtkeychain
qscintilla qscintilla
qtlocation
qtserialport qtserialport
qtxmlpatterns qtxmlpatterns
qt3d qt3d
@ -132,7 +134,11 @@ in mkDerivation rec {
"-DWITH_3D=True" "-DWITH_3D=True"
"-DWITH_PDAL=TRUE" "-DWITH_PDAL=TRUE"
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ] ++ 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 dontWrapGApps = true; # wrapper params passed below