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

grass: use python2

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-11-08 15:39:15 +01:00
parent 1f501a2ced
commit e7f9195169
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/gis/grass/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw { stdenv, fetchurl, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw
, cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas
, proj, gdal, geos, sqlite, postgresql, mysql, pythonPackages , proj, gdal, geos, sqlite, postgresql, mysql, python2Packages
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo
readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ] readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ]
++ (with pythonPackages; [ python dateutil wxPython30 numpy ]); ++ (with python2Packages; [ python dateutil wxPython30 numpy ]);
configureFlags = [ configureFlags = [
"--with-proj-share=${proj}/share/proj" "--with-proj-share=${proj}/share/proj"
@ -59,7 +59,7 @@ stdenv.mkDerivation {
postInstall = '' postInstall = ''
wrapProgram $out/bin/grass70 \ wrapProgram $out/bin/grass70 \
--set PYTHONPATH $PYTHONPATH \ --set PYTHONPATH $PYTHONPATH \
--set GRASS_PYTHON ${pythonPackages.python}/bin/${pythonPackages.python.executable} --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable}
ln -s $out/grass-*/lib $out/lib ln -s $out/grass-*/lib $out/lib
''; '';