Merge pull request #9138 from vbgl/master

qgis: fix python console and processing plugin
This commit is contained in:
vbgl 2015-08-07 14:56:11 +02:00
commit e16be46be2

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl,
pyqt4, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
stdenv.mkDerivation rec {
name = "qgis-2.10.1";
buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt qscintilla
buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl qwt qscintilla
fcgi libspatialindex libspatialite postgresql ] ++
(with pythonPackages; [ numpy psycopg2 ]);
(with pythonPackages; [ numpy psycopg2 ]) ++ [ pythonPackages.qscintilla ];
nativeBuildInputs = [ cmake makeWrapper ];