qgis: fix build

(cherry picked from commit dccf8c5f27ed4a1af47f1fc052e9ac206f3a61b7)
Signed-off-by: Domen Kožar <domen@dev.si>
This commit is contained in:
Domen Kožar 2016-09-11 21:19:53 +02:00
parent e917e47045
commit fc74bf2ccc

View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper , qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper
, qjson, qca2, txt2tags , qjson, qca2, txt2tags, openssl
, withGrass ? false, grass , withGrass ? false, grass
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qgis-2.16.2"; name = "qgis-2.16.2";
buildInputs = [ gdal qt4 flex bison proj geos xlibsWrapper sqlite gsl qwt qscintilla buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
(stdenv.lib.optional withGrass grass) ++ (stdenv.lib.optional withGrass grass) ++
(with pythonPackages; [ numpy psycopg2 requests2 ]) ++ [ pythonPackages.qscintilla ]; (with pythonPackages; [ numpy psycopg2 requests2 pythonPackages.qscintilla sip ]);
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
# To handle the lack of 'local' RPATH; required, as they call one of # To handle the lack of 'local' RPATH; required, as they call one of
# their built binaries requiring their libs, in the build process. # their built binaries requiring their libs, in the build process.
preBuild = '' preBuild = ''
export LD_LIBRARY_PATH=`pwd`/output/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=`pwd`/output/lib:${stdenv.lib.makeLibraryPath [ openssl ]}:$LD_LIBRARY_PATH
''; '';
src = fetchurl { src = fetchurl {
@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/qgis \ wrapProgram $out/bin/qgis \
--prefix PYTHONPATH : $PYTHONPATH --prefix PYTHONPATH : $PYTHONPATH \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]}
''; '';
meta = { meta = {