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 , qtkeychain 29 , qt3d 30 , qscintilla 31 , qtserialport 32 , qtxmlpatterns 33 , withGrass ? true 34 , grass 35 - , withWebKit ? true 36 , qtwebkit 37 , pdal 38 , zstd ··· 109 qca-qt5 110 qtkeychain 111 qscintilla 112 qtserialport 113 qtxmlpatterns 114 qt3d ··· 132 "-DWITH_3D=True" 133 "-DWITH_PDAL=TRUE" 134 ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" 135 - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; 136 137 dontWrapGApps = true; # wrapper params passed below 138
··· 28 , qtkeychain 29 , qt3d 30 , qscintilla 31 + , qtlocation 32 , qtserialport 33 , qtxmlpatterns 34 , withGrass ? true 35 , grass 36 + , withWebKit ? false 37 , qtwebkit 38 , pdal 39 , zstd ··· 110 qca-qt5 111 qtkeychain 112 qscintilla 113 + qtlocation 114 qtserialport 115 qtxmlpatterns 116 qt3d ··· 134 "-DWITH_3D=True" 135 "-DWITH_PDAL=TRUE" 136 ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" 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 + ); 142 143 dontWrapGApps = true; # wrapper params passed below 144
+8 -2
pkgs/applications/gis/qgis/unwrapped.nix
··· 28 , qtkeychain 29 , qt3d 30 , qscintilla 31 , qtserialport 32 , qtxmlpatterns 33 , withGrass ? true 34 , grass 35 - , withWebKit ? true 36 , qtwebkit 37 , pdal 38 , zstd ··· 109 qca-qt5 110 qtkeychain 111 qscintilla 112 qtserialport 113 qtxmlpatterns 114 qt3d ··· 132 "-DWITH_3D=True" 133 "-DWITH_PDAL=TRUE" 134 ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" 135 - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; 136 137 dontWrapGApps = true; # wrapper params passed below 138
··· 28 , qtkeychain 29 , qt3d 30 , qscintilla 31 + , qtlocation 32 , qtserialport 33 , qtxmlpatterns 34 , withGrass ? true 35 , grass 36 + , withWebKit ? false 37 , qtwebkit 38 , pdal 39 , zstd ··· 110 qca-qt5 111 qtkeychain 112 qscintilla 113 + qtlocation 114 qtserialport 115 qtxmlpatterns 116 qt3d ··· 134 "-DWITH_3D=True" 135 "-DWITH_PDAL=TRUE" 136 ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" 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 + ); 142 143 dontWrapGApps = true; # wrapper params passed below 144