summary refs log tree commit diff
path: root/pkgs/development/libraries/geos
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@viric.name>2013-07-18 11:40:23 +0200
committerLluís Batlle i Rossell <viric@viric.name>2013-07-18 11:43:01 +0200
commit328774ab1fbb665d37acd83cc39da506015f5ecf (patch)
tree33287bf92ea7691c7c4d5c2aa3f803a7bda63698 /pkgs/development/libraries/geos
parentd898762d8b0db968286ed515fd69243ea4a741ed (diff)
downloadnixpkgs-328774ab1fbb665d37acd83cc39da506015f5ecf.tar
nixpkgs-328774ab1fbb665d37acd83cc39da506015f5ecf.tar.gz
nixpkgs-328774ab1fbb665d37acd83cc39da506015f5ecf.tar.bz2
nixpkgs-328774ab1fbb665d37acd83cc39da506015f5ecf.tar.lz
nixpkgs-328774ab1fbb665d37acd83cc39da506015f5ecf.tar.xz
nixpkgs-328774ab1fbb665d37acd83cc39da506015f5ecf.tar.zst
nixpkgs-328774ab1fbb665d37acd83cc39da506015f5ecf.zip
Updating qgis (1.8.0 & geos (3.3.8).
I also add libspatialindex and libspatialite, to get the latest qgis building.
Diffstat (limited to 'pkgs/development/libraries/geos')
-rw-r--r--pkgs/development/libraries/geos/default.nix16
1 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index 734bde71338..56c3c3e7a2b 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -2,7 +2,7 @@
 
 let inherit (composableDerivation) edf; in
 
-composableDerivation.composableDerivation {} {
+composableDerivation.composableDerivation {} rec {
 
   flags =
   # python and ruby untested 
@@ -10,20 +10,14 @@ composableDerivation.composableDerivation {} {
     # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else [])
     # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };}
 
-  name = "geos-3.2.2";
+  name = "geos-3.3.8";
 
   src = fetchurl {
-    url = http://download.osgeo.org/geos/geos-3.2.2.tar.bz2;
-    sha256 = "0711wcq46h7zgvp0bk4m60vmx1wal9db1q36mayf0vwk34hprpr4";
+    url = "http://download.osgeo.org/geos/${name}.tar.bz2";
+    sha256 = "0fshz8s9g610ycl4grrmcdcxb01aqpc6qac3x3jjik0vlz8x9v7b";
   };
 
-  # for development version. can be removed ?
-  #configurePhase = "
-  #  [ -f configure ] || \\
-  #  LIBTOOLIZE=libtoolize ./autogen.sh
-  #  [>{ automake --add-missing; autoconf; }
-  #  unset configurePhase; configurePhase
-  #";
+  enableParallelBuilding = true;
 
   meta = {
     description = "C++ port of the Java Topology Suite (JTS)";