diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-12-20 17:32:59 +0100 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2015-01-19 16:18:01 +0100 |
commit | 7ffd6825e1e3d3cadac545b44c914057a642939c (patch) | |
tree | 5e37be5de57ad8e4bd54fd3c4894f8eabd5b200f /pkgs/applications/gis/qgis | |
parent | b23a6aaab4641ec8f974ab3f05c0c834735e6a43 (diff) |
qgis: update from 2.4.0 to 2.6.1
Diffstat (limited to 'pkgs/applications/gis/qgis')
-rw-r--r-- | pkgs/applications/gis/qgis/default.nix | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 231533e580ea3..8e36ec9b168cc 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl, - pyqt4, qwt, fcgi, python, libspatialindex, libspatialite }: + pyqt4, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }: stdenv.mkDerivation rec { - name = "qgis-2.4.0"; + name = "qgis-2.6.1"; - buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt - fcgi libspatialindex libspatialite ]; + buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt qscintilla + fcgi libspatialindex libspatialite postgresql ] ++ + (with pythonPackages; [ numpy psycopg2 ]); - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake makeWrapper ]; # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory #enableParallelBuilding = true; @@ -20,11 +21,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "711b7d81ddff45b083a21f05c8aa5093a6a38a0ee42dfcc873234fcef1fcdd76"; - - + sha256 = "1avw9mnhrcxsdalqr2yhyif1cacl4dsgcpfc31axkv7vj401djnl"; }; + postInstall = '' + wrapProgram $out/bin/qgis \ + --prefix PYTHONPATH : $PYTHONPATH + ''; + meta = { description = "User friendly Open Source Geographic Information System"; homepage = http://www.qgis.org; |