qgis-ltr: 3.40.11 -> 3.40.12
This commit is contained in:
@@ -22,7 +22,6 @@
|
|||||||
gsl,
|
gsl,
|
||||||
hdf5,
|
hdf5,
|
||||||
libpq,
|
libpq,
|
||||||
libspatialindex,
|
|
||||||
libspatialite,
|
libspatialite,
|
||||||
libzip,
|
libzip,
|
||||||
netcdf,
|
netcdf,
|
||||||
@@ -82,14 +81,14 @@ let
|
|||||||
];
|
];
|
||||||
in
|
in
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
version = "3.40.11";
|
version = "3.40.12";
|
||||||
pname = "qgis-ltr-unwrapped";
|
pname = "qgis-ltr-unwrapped";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "qgis";
|
owner = "qgis";
|
||||||
repo = "QGIS";
|
repo = "QGIS";
|
||||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||||
hash = "sha256-HjdOLG/x8qXTDlMKW6+jBuwi+36rBkBFM1OCe3BcjWY=";
|
hash = "sha256-QsAiE3HC71lGsdUKW9QZ5gCLCRsOCCM2IR3MKJlJ0vk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
@@ -116,7 +115,6 @@ mkDerivation rec {
|
|||||||
gsl
|
gsl
|
||||||
hdf5
|
hdf5
|
||||||
libpq
|
libpq
|
||||||
libspatialindex
|
|
||||||
libspatialite
|
libspatialite
|
||||||
libzip
|
libzip
|
||||||
netcdf
|
netcdf
|
||||||
@@ -163,6 +161,9 @@ mkDerivation rec {
|
|||||||
# Remove for QGIS 3.42
|
# Remove for QGIS 3.42
|
||||||
"-DCMAKE_POLICY_DEFAULT_CMP0175=OLD"
|
"-DCMAKE_POLICY_DEFAULT_CMP0175=OLD"
|
||||||
"-DCMAKE_POLICY_DEFAULT_CMP0177=OLD"
|
"-DCMAKE_POLICY_DEFAULT_CMP0177=OLD"
|
||||||
|
|
||||||
|
# See https://github.com/libspatialindex/libspatialindex/issues/276
|
||||||
|
"-DWITH_INTERNAL_SPATIALINDEX=True"
|
||||||
]
|
]
|
||||||
++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
|
++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
|
||||||
++ lib.optional withServer [
|
++ lib.optional withServer [
|
||||||
|
|||||||
Reference in New Issue
Block a user