diff options
| -rw-r--r-- | pkgs/applications/misc/qgis/default.nix | 27 | ||||
| -rw-r--r-- | pkgs/applications/misc/qgis/r14988.diff | 38 | ||||
| -rw-r--r-- | pkgs/development/libraries/geos/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/libraries/libspatialindex/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/development/libraries/libspatialite/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
6 files changed, 69 insertions, 59 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]; }; } diff --git a/pkgs/applications/misc/qgis/r14988.diff b/pkgs/applications/misc/qgis/r14988.diff deleted file mode 100644 index 95d55047e1d..00000000000 --- a/pkgs/applications/misc/qgis/r14988.diff +++ /dev/null @@ -1,38 +0,0 @@ -Index: qgis/python/core/conversions.sip -=================================================================== ---- qgis/python/core/conversions.sip (revision 14323) -+++ qgis/python/core/conversions.sip (revision 14988) -@@ -16,4 +16,5 @@ - - %Feature QSETINT_CONVERSION -+%Feature QSETTYPE_CONVERSION - - %ModuleHeaderCode -@@ -321,5 +322,5 @@ - %End - -- -+%If (QSETTYPE_CONVERSION) - template <TYPE> - %MappedType QSet<TYPE> -@@ -395,6 +396,5 @@ - - }; -- -- -+%End - - template<TYPE> -Index: qgis/python/CMakeLists.txt -=================================================================== ---- qgis/python/CMakeLists.txt (revision 14330) -+++ qgis/python/CMakeLists.txt (revision 14988) -@@ -44,4 +44,8 @@ - ENDIF(NOT PYQT4_VERSION_NUM LESS 263941) - -+IF(NOT PYQT4_VERSION_NUM LESS 264194) # 0x040802 -+ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION) -+ENDIF(NOT PYQT4_VERSION_NUM LESS 264194) -+ - # core module - FILE(GLOB sip_files_core core/*.sip) 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)"; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix new file mode 100644 index 00000000000..c48c5265fc4 --- /dev/null +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +let version = "1.8.1"; in + +stdenv.mkDerivation rec { + name = "libspatialindex-${version}"; + + src = fetchurl { + url = "http://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; + sha256 = "1ay1kxn4baccd0cqx466v7fn8c8gcfbhlnd5mbdnd7s4aw0ix88j"; + }; + + enableParallelBuilding = true; + + meta = { + description = "Extensible spatial index library in C++"; + homepage = http://libspatialindex.github.io/; + license = "MIT"; + }; +} diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix new file mode 100644 index 00000000000..d5b401b804f --- /dev/null +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, sqlite, zlib, proj, geos }: + +stdenv.mkDerivation rec { + name = "libspatialite-4.1.1"; + + src = fetchurl { + url = "http://www.gaia-gis.it/gaia-sins/${name}.tar.gz"; + sha256 = "03wikddl60ly0yh8szrra1ng2iccsdzz645vkn6a7x2jz45a5084"; + }; + + buildInputs = [ sqlite zlib proj geos ]; + + configureFlags = "--disable-freexl"; + + enableParallelBuilding = true; + + meta = { + description = "Extensible spatial index library in C++"; + homepage = https://www.gaia-gis.it/fossil/libspatialite; + # They allow any of these + license = [ "GPLv2+" "LGPLv2+" "MPL1.1" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d85880ac439..2505f239a86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4786,6 +4786,10 @@ let libstartup_notification = callPackage ../development/libraries/startup-notification { }; + libspatialindex = callPackage ../development/libraries/libspatialindex { }; + + libspatialite = callPackage ../development/libraries/libspatialite { }; + libtasn1 = callPackage ../development/libraries/libtasn1 { }; libtheora = callPackage ../development/libraries/libtheora { }; |