1 files changed, 17 insertions, 10 deletions
diff --git a/pkgs/applications/misc/qgis/default.nix b/pkgs/applications/misc/qgis/default.nix
index 834b3f0cfbe..d6711c82968 100644
--- a/pkgs/applications/misc/qgis/default.nix
+++ b/pkgs/applications/misc/qgis/default.nix
@@ -1,25 +1,32 @@
 { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl,
-  pyqt4, qwt, fcgi, python }:
+  pyqt4, qwt, fcgi, python, libspatialindex, libspatialite }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-1.6.0";
+  name = "qgis-1.8.0";
 
   buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt
-    fcgi ];
+    fcgi libspatialindex libspatialite ];
 
-  nativeBuildInputs = [ cmake python];
+  nativeBuildInputs = [ cmake python ];
 
-  patches = [ ./r14988.diff ];
+  enableParallelBuilding = true;
+
+  # 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
+  '';
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "0vlz1z3scj3k6nxf3hzfiq7k2773i6xvk6dvj4axs2f4njpnx7pr";
+    sha256 = "1aq32ch61bqsvh39lmrxah1fmh18cd3nqyi1l0sn6ssa3kwf82vh";
   };
 
   meta = {
-    description = "user friendly Open Source Geographic Information System";
-    homepage = ttp://www.qgis.org;
-    # you can choose one of the following licenses:
-    license = [ "GPL" ];
+    description = "User friendly Open Source Geographic Information System";
+    homepage = http://www.qgis.org;
+    license = "GPLv2+";
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [viric];
   };
 }