swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

qgis: 3.32.3 -> 3.34.0

Browse source 
Co-authored-by: timlinux

closes: #264482
This commit is contained in:
Ivan Mincik 2023-11-01 20:08:38 +01:00
parent ac3f3214fb
commit f495f23554
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
, fetchpatch
, makeWrapper
, mkDerivation
, substituteAll
@ -12,6 +11,7 @@
, bison
, cmake
, draco
, exiv2
, fcgi
, flex
@ -64,8 +64,8 @@ let
owslib
psycopg2
pygments
pyqt-builder
pyqt5
pyqt-builder
python-dateutil
pytz
pyyaml
@ -77,14 +77,14 @@ let
urllib3
];
in mkDerivation rec {
version = "3.32.3";
version = "3.34.0";
pname = "qgis-unwrapped";
src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-ge5ne22sDLKbrJk2vYQxpu3iRXSoOk9924c/RdtD3Nc=";
hash = "sha256-+Yzp8kfd7cfxTwsrxRo+6uS+2Aj4HfKA2E8hSf7htsU=";
};
passthru = {
@ -104,6 +104,7 @@ in mkDerivation rec {
];
buildInputs = [
draco
exiv2
fcgi
geos
@ -142,11 +143,6 @@ in mkDerivation rec {
pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}";
qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}";
})
(fetchpatch {
name = "exiv2-0.28.patch";
url = "https://github.com/qgis/QGIS/commit/32f5418fc4f7bb2ee986dee1824ff2989c113a94.patch";
hash = "sha256-zWyf+kLro4ZyUJLX/nDjY0nLneTaI1DxHvRsvwoWq14=";
})
];
# Add path to Qt platform plugins
@ -156,8 +152,9 @@ in mkDerivation rec {
'';
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DWITH_3D=True"
"-DWITH_PDAL=TRUE"
"-DWITH_PDAL=True"
"-DENABLE_TESTS=False"
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
++ lib.optional withGrass (let