diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2019-07-13 18:56:44 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2019-07-14 09:59:28 -0700 |
commit | 70671e71d1e9fedcd8927172d585295a7c83a1be (patch) | |
tree | 48f4f306c1ce772f901ec6b69d26c13749a5144c | |
parent | c93c65a21d25c8a7ecac6eb2c154261c2dd9465f (diff) |
qgis: 3.4.8 -> 3.8.0
-rw-r--r-- | pkgs/applications/gis/qgis/unwrapped.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 6e7fb375eab9..a57b180d5b23 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl +{ stdenv, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python3Packages, libspatialindex, libspatialite, postgresql -, txt2tags, openssl, libzip, hdf5, netcdf +, txt2tags, openssl, libzip, hdf5, netcdf, exiv2 , qtbase, qtwebkit, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns , withGrass ? true, grass }: @@ -10,12 +10,15 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in stdenv.mkDerivation rec { - version = "3.4.8"; - name = "qgis-unwrapped-${version}"; + version = "3.8.0"; + pname = "qgis"; + name = "${pname}-unwrapped-${version}"; - src = fetchurl { - url = "http://qgis.org/downloads/qgis-${version}.tar.bz2"; - sha256 = "13dy9y7ipv25x3k31njhjljdav36xay6s82g6ywaqf1xxh3s567w"; + src = fetchFromGitHub { + owner = "qgis"; + repo = "QGIS"; + rev = "final-${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "11jqj6lavpw9piv0rm8vvbgd99zhcxl6yfjg699wlrjlyf71xac5"; }; passthru = { @@ -23,7 +26,7 @@ in stdenv.mkDerivation rec { inherit python3Packages; }; - buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt + buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt exiv2 fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf qtbase qtwebkit qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns] ++ (stdenv.lib.optional withGrass grass) ++ pythonBuildInputs; @@ -36,7 +39,7 @@ in stdenv.mkDerivation rec { # build to use PYQT5_SIP_DIR consistently. postPatch = '' substituteInPlace cmake/FindPyQt5.py \ - --replace 'pyqtcfg.pyqt_sip_dir' '"${python3Packages.pyqt5}/share/sip/PyQt5"' + --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${python3Packages.pyqt5}/share/sip/PyQt5"' ''; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" |