public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qgis: 3.4.8 -> 3.8.0

Browse Source
This commit is contained in:
Jonathan Ringer 2019-07-13 18:56:44 -07:00
parent c93c65a21d
commit 70671e71d1
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/gis/qgis/unwrapped.nix
View File

@ -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 , 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 , qtbase, qtwebkit, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns
, withGrass ? true, grass , withGrass ? true, grass
}: }:
@ -10,12 +10,15 @@ let
[ qscintilla-qt5 gdal jinja2 numpy psycopg2 [ qscintilla-qt5 gdal jinja2 numpy psycopg2
chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "3.4.8"; version = "3.8.0";
name = "qgis-unwrapped-${version}"; pname = "qgis";
name = "${pname}-unwrapped-${version}";
src = fetchurl { src = fetchFromGitHub {
url = "http://qgis.org/downloads/qgis-${version}.tar.bz2"; owner = "qgis";
sha256 = "13dy9y7ipv25x3k31njhjljdav36xay6s82g6ywaqf1xxh3s567w"; repo = "QGIS";
rev = "final-${lib.replaceStrings ["."] ["_"] version}";
sha256 = "11jqj6lavpw9piv0rm8vvbgd99zhcxl6yfjg699wlrjlyf71xac5";
}; };
passthru = { passthru = {
@ -23,7 +26,7 @@ in stdenv.mkDerivation rec {
inherit python3Packages; 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 fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf
qtbase qtwebkit qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns] ++ qtbase qtwebkit qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns] ++
(stdenv.lib.optional withGrass grass) ++ pythonBuildInputs; (stdenv.lib.optional withGrass grass) ++ pythonBuildInputs;
@ -36,7 +39,7 @@ in stdenv.mkDerivation rec {
# build to use PYQT5_SIP_DIR consistently. # build to use PYQT5_SIP_DIR consistently.
postPatch = '' postPatch = ''
substituteInPlace cmake/FindPyQt5.py \ 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" cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF"