update qgis so that it compiles again

svn path=/nixpkgs/trunk/; revision=15545
This commit is contained in:
Marc Weber 2009-05-11 06:00:23 +00:00
parent d8e3181425
commit fe62c65b59
2 changed files with 7 additions and 7 deletions

View file

@ -17,18 +17,18 @@ composableDerivation.composableDerivation {} {
# md5="ac0560e0a2d4e6258c8639f1e9b56df3"; rev="7704"; }; # md5="ac0560e0a2d4e6258c8639f1e9b56df3"; rev="7704"; };
src = fetchurl { src = fetchurl {
url = "http://download.osgeo.org/qgis/src/qgis_${version}.tar.gz"; url = "http://download.osgeo.org/qgis/src/qgis_${version}.tar.gz";
sha256 = "17vqbld4wr9jyn1s5n0bkpaminsgc2dzcgdfk8ic168xydnwa7b3"; sha256 = "07yyic9sn1pz20wjk7k560jwqz6b19rhf2gawybz38xq1f8rjwd4";
}; };
meta = { meta = {
description = "user friendly Open Source Geographic Information System"; description = "user friendly Open Source Geographic Information System";
homepage = http://www.qgis.org; homepage = ttp://www.qgis.org;
# you can choose one of the following licenses: # you can choose one of the following licenses:
license = [ "GPL" ]; license = [ "GPL" ];
}; };
phases = "unpackPhase buildPhase installPhase"; phases = "unpackPhase buildPhase installPhase";
buildPhase = ''pwd;echo XXXXXXXXX; VERBOSE=1 cmake -DCMAKE_INSTALL_PREFIX=$out ''${cfgOption} ..''; buildPhase = ''pwd; mkdir build; cd build; VERBOSE=1 cmake -DCMAKE_INSTALL_PREFIX=$out ''${cfgOption} ..'';
postUnpack = '' postUnpack = ''
export CMAKE_SYSTEM_LIBRARY_PATH= export CMAKE_SYSTEM_LIBRARY_PATH=

View file

@ -3040,10 +3040,10 @@ let
}; };
gdal = stdenv.mkDerivation { gdal = stdenv.mkDerivation {
name = "gdal-1.4.2"; name = "gdal-1.6.1-rc1";
src = fetchurl { src = fetchurl {
url = http://download.osgeo.org/gdal/gdal-1.4.2.tar.gz; url = ftp://ftp.remotesensing.org/gdal/gdal-1.6.1-RC1.tar.gz;
sha256 = "1vl8ym9y7scm0yd4vghjfqims69b9h1gn9l4zvy2jyglh35p8vpf"; sha256 = "0f7da588yvb1d3l3gk5m0hrqlhg8m4gw93aip3dwkmnawz9r0qcw";
}; };
}; };
@ -7113,7 +7113,7 @@ let
}; };
# doesn't compile yet - in case someone else want's to continue .. # doesn't compile yet - in case someone else want's to continue ..
qgis = (selectVersion ../applications/misc/qgis "0.11.0") { qgis = (selectVersion ../applications/misc/qgis "1.0.1-2") {
inherit composableDerivation fetchsvn stdenv flex lib inherit composableDerivation fetchsvn stdenv flex lib
ncurses fetchurl perl cmake gdal geos proj x11 ncurses fetchurl perl cmake gdal geos proj x11
gsl libpng zlib bison gsl libpng zlib bison