I also add libspatialindex and libspatialite, to get the latest qgis building.wip/yesman
parent
d898762d8b
commit
328774ab1f
@ -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]; |
||||
}; |
||||
} |
||||
|
@ -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)
|
@ -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"; |
||||
}; |
||||
} |
@ -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" ]; |
||||
}; |
||||
} |
Loading…
Reference in new issue