pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #208692 from hqurve/qgis

qgis, qgis-ltr: disable qtwebkit by default and correctly link grass

authored by Nikolay Korotkiy and committed by GitHub 12461da0 918ce50e

+16 -4
unified split
+8 -2
pkgs/applications/gis/qgis/unwrapped-ltr.nix
··· 28 28 , qtkeychain 29 29 , qt3d 30 30 , qscintilla 31 + , qtlocation 31 32 , qtserialport 32 33 , qtxmlpatterns 33 34 , withGrass ? true 34 35 , grass 35 - , withWebKit ? true 36 + , withWebKit ? false 36 37 , qtwebkit 37 38 , pdal 38 39 , zstd ··· 109 110 qca-qt5 110 111 qtkeychain 111 112 qscintilla 113 + qtlocation 112 114 qtserialport 113 115 qtxmlpatterns 114 116 qt3d ··· 132 134 "-DWITH_3D=True" 133 135 "-DWITH_PDAL=TRUE" 134 136 ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" 135 - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; 137 + ++ lib.optional withGrass (let 138 + gmajor = lib.versions.major grass.version; 139 + gminor = lib.versions.minor grass.version; 140 + in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" 141 + ); 136 142 137 143 dontWrapGApps = true; # wrapper params passed below 138 144
+8 -2
pkgs/applications/gis/qgis/unwrapped.nix
··· 28 28 , qtkeychain 29 29 , qt3d 30 30 , qscintilla 31 + , qtlocation 31 32 , qtserialport 32 33 , qtxmlpatterns 33 34 , withGrass ? true 34 35 , grass 35 - , withWebKit ? true 36 + , withWebKit ? false 36 37 , qtwebkit 37 38 , pdal 38 39 , zstd ··· 109 110 qca-qt5 110 111 qtkeychain 111 112 qscintilla 113 + qtlocation 112 114 qtserialport 113 115 qtxmlpatterns 114 116 qt3d ··· 132 134 "-DWITH_3D=True" 133 135 "-DWITH_PDAL=TRUE" 134 136 ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" 135 - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; 137 + ++ lib.optional withGrass (let 138 + gmajor = lib.versions.major grass.version; 139 + gminor = lib.versions.minor grass.version; 140 + in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" 141 + ); 136 142 137 143 dontWrapGApps = true; # wrapper params passed below 138 144