diff options
| author | Domen Kožar <domen@dev.si> | 2016-09-11 21:19:53 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-09-11 21:20:50 +0200 |
| commit | fc74bf2ccc025c993b97ab67e2ad4737fd425484 (patch) | |
| tree | 532d2ff223ed99cf0b4339840777e38f21c34353 /pkgs | |
| parent | e917e470452391b033a6b65532a225dd72fe86fa (diff) | |
| download | nixlib-fc74bf2ccc025c993b97ab67e2ad4737fd425484.tar nixlib-fc74bf2ccc025c993b97ab67e2ad4737fd425484.tar.gz nixlib-fc74bf2ccc025c993b97ab67e2ad4737fd425484.tar.bz2 nixlib-fc74bf2ccc025c993b97ab67e2ad4737fd425484.tar.lz nixlib-fc74bf2ccc025c993b97ab67e2ad4737fd425484.tar.xz nixlib-fc74bf2ccc025c993b97ab67e2ad4737fd425484.tar.zst nixlib-fc74bf2ccc025c993b97ab67e2ad4737fd425484.zip | |
qgis: fix build
(cherry picked from commit dccf8c5f27ed4a1af47f1fc052e9ac206f3a61b7) Signed-off-by: Domen Kožar <domen@dev.si>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/gis/qgis/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 880053e05c29..cce683067e70 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper -, qjson, qca2, txt2tags +, qjson, qca2, txt2tags, openssl , withGrass ? false, grass }: stdenv.mkDerivation rec { 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 ] ++ (stdenv.lib.optional withGrass grass) ++ - (with pythonPackages; [ numpy psycopg2 requests2 ]) ++ [ pythonPackages.qscintilla ]; + (with pythonPackages; [ numpy psycopg2 requests2 pythonPackages.qscintilla sip ]); nativeBuildInputs = [ cmake makeWrapper ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process. 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 { @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/qgis \ - --prefix PYTHONPATH : $PYTHONPATH + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]} ''; meta = { |