From fe62c65b59fe8d56310250f7e7ddd5bf6caa1d21 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 11 May 2009 06:00:23 +0000
Subject: [PATCH] update qgis so that it compiles again

svn path=/nixpkgs/trunk/; revision=15545
---
 pkgs/applications/misc/qgis/{0.11.0.nix => 1.0.1-2.nix} | 6 +++---
 pkgs/top-level/all-packages.nix                         | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/applications/misc/qgis/{0.11.0.nix => 1.0.1-2.nix} (86%)

diff --git a/pkgs/applications/misc/qgis/0.11.0.nix b/pkgs/applications/misc/qgis/1.0.1-2.nix
similarity index 86%
rename from pkgs/applications/misc/qgis/0.11.0.nix
rename to pkgs/applications/misc/qgis/1.0.1-2.nix
index ed8bb6063c31..d17f3ec7502f 100644
--- a/pkgs/applications/misc/qgis/0.11.0.nix
+++ b/pkgs/applications/misc/qgis/1.0.1-2.nix
@@ -17,18 +17,18 @@ composableDerivation.composableDerivation {} {
   #                md5="ac0560e0a2d4e6258c8639f1e9b56df3"; rev="7704"; };
   src = fetchurl {
     url = "http://download.osgeo.org/qgis/src/qgis_${version}.tar.gz";
-    sha256 = "17vqbld4wr9jyn1s5n0bkpaminsgc2dzcgdfk8ic168xydnwa7b3";
+    sha256 = "07yyic9sn1pz20wjk7k560jwqz6b19rhf2gawybz38xq1f8rjwd4";
   };
 
   meta = {
     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:
     license = [ "GPL" ];
   };
 
   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 = ''
     export CMAKE_SYSTEM_LIBRARY_PATH=
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e4a337e29ee..1f1868095eb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3040,10 +3040,10 @@ let
   };
 
   gdal = stdenv.mkDerivation {
-    name = "gdal-1.4.2";
+    name = "gdal-1.6.1-rc1";
     src = fetchurl {
-      url = http://download.osgeo.org/gdal/gdal-1.4.2.tar.gz;
-      sha256 = "1vl8ym9y7scm0yd4vghjfqims69b9h1gn9l4zvy2jyglh35p8vpf";
+      url = ftp://ftp.remotesensing.org/gdal/gdal-1.6.1-RC1.tar.gz;
+      sha256 = "0f7da588yvb1d3l3gk5m0hrqlhg8m4gw93aip3dwkmnawz9r0qcw";
     };
   };
 
@@ -7113,7 +7113,7 @@ let
   };
 
   # 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
             ncurses fetchurl perl cmake gdal geos proj x11
             gsl libpng zlib bison