diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2013-08-16 17:42:32 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-09-15 11:39:23 +0200 |
| commit | 50a1eb53ffa397418c27db493d52cad7c3d206e3 (patch) | |
| tree | 5cde468806b6a29efbe2e801da00671aae4d380e /pkgs/applications/misc | |
| parent | 513dad6527239cdd2b41fad23c3261c6b6a1a85e (diff) | |
| download | nixlib-50a1eb53ffa397418c27db493d52cad7c3d206e3.tar nixlib-50a1eb53ffa397418c27db493d52cad7c3d206e3.tar.gz nixlib-50a1eb53ffa397418c27db493d52cad7c3d206e3.tar.bz2 nixlib-50a1eb53ffa397418c27db493d52cad7c3d206e3.tar.lz nixlib-50a1eb53ffa397418c27db493d52cad7c3d206e3.tar.xz nixlib-50a1eb53ffa397418c27db493d52cad7c3d206e3.tar.zst nixlib-50a1eb53ffa397418c27db493d52cad7c3d206e3.zip | |
Navit update to current svn
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/navit/default.nix | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 576647555abe..ef1e777f55fd 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,24 +1,19 @@ { stdenv, fetchsvn, pkgconfig, gtk, SDL, fontconfig, freetype, imlib2, SDL_image, mesa, -libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, autoconf, automake, libtool, cvs }: +libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}: stdenv.mkDerivation rec { name = "navit-svn-3537"; src = fetchsvn { - url = https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit; - rev = 3537; - sha256 = "1ajd439i7z8xm16kqh20qalvafy9miyy4accc8j7w30c4qgc2bb7"; + url = svn://svn.code.sf.net/p/navit/code/trunk/navit; + rev = 5576; + sha256 = "1xx62l5srfhh9cfi7n3pxj8hpcgr1rpa0hzfmbrqadzv09z36723"; }; # 'cvs' is only for the autogen buildInputs = [ pkgconfig gtk SDL fontconfig freetype imlib2 SDL_image mesa - libXmu freeglut python gettext quesoglc gd postgresql - autoconf automake libtool cvs ]; + libXmu freeglut python gettext quesoglc gd postgresql cmake qt4 SDL_ttf fribidi ]; - preConfigure = '' - sh ./autogen.sh - ''; - - configureFlags = [ "--disable-samplemap" ]; + cmakeFlags = [ "-DSAMPLE_MAP=n" ]; meta = { homepage = http://www.navit-project.org/; |