diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2013-07-18 11:40:23 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-07-18 11:43:01 +0200 |
| commit | 328774ab1fbb665d37acd83cc39da506015f5ecf (patch) | |
| tree | 33287bf92ea7691c7c4d5c2aa3f803a7bda63698 /pkgs/applications/misc | |
| parent | d898762d8b0db968286ed515fd69243ea4a741ed (diff) | |
| download | nixlib-328774ab1fbb665d37acd83cc39da506015f5ecf.tar nixlib-328774ab1fbb665d37acd83cc39da506015f5ecf.tar.gz nixlib-328774ab1fbb665d37acd83cc39da506015f5ecf.tar.bz2 nixlib-328774ab1fbb665d37acd83cc39da506015f5ecf.tar.lz nixlib-328774ab1fbb665d37acd83cc39da506015f5ecf.tar.xz nixlib-328774ab1fbb665d37acd83cc39da506015f5ecf.tar.zst nixlib-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/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/qgis/default.nix | 27 | ||||
| -rw-r--r-- | pkgs/applications/misc/qgis/r14988.diff | 38 |
2 files changed, 17 insertions, 48 deletions
diff --git a/pkgs/applications/misc/qgis/default.nix b/pkgs/applications/misc/qgis/default.nix index 834b3f0cfbe3..d6711c82968e 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 95d55047e1da..000000000000 --- 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) |