qgis-1.6.0, compiles

Don't know whether it works: it fails to start on my computer because it loads
KDE gui_platform plugin from incompatible Qt version.

svn path=/nixpkgs/trunk/; revision=28483
This commit is contained in:
Yury G. Kudryashov 2011-08-11 09:35:17 +00:00
parent bac6982ca8
commit b7c6bd30cf
4 changed files with 51 additions and 74 deletions

View File

@ -1,24 +1,19 @@
args: with args;
let inherit (builtins) getAttr;
edf = composableDerivation.edf;
optionIncLib = name : attr : " -D${name}_INCLUDE_DIR=${getAttr attr args}/incclude"
+ " -D${name}_LIBRARY=${getAttr attr args}/lib "; # lib 64?
in
composableDerivation.composableDerivation {} {
{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl,
pyqt4, qwt, fcgi, python }:
buildInputs = [ gdal cmake qt flex bison proj geos x11 sqlite gsl pyqt4];
cfgOption = [
# without this option it can't find sqlite libs yet (missing symbols..) (TODO)
"-DWITH_INTERNAL_SQLITE3=TRUE"
];
stdenv.mkDerivation rec {
name = "qgis-1.6.0";
name = "qgis-1.4.0";
buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt
fcgi ];
buildNativeInputs = [ cmake python];
patches = [ ./r14988.diff ];
# src = args.fetchsvn { url=https://svn.qgis.org/repos/qgis/trunk/qgis;
# md5="ac0560e0a2d4e6258c8639f1e9b56df3"; rev="7704"; };
src = fetchurl {
url = http://download.osgeo.org/qgis/src/qgis_1.4.0.tar.gz;
sha256 = "1nn71j9pnkqcprwvzqnybh6ybl0zp50jj04lm769bnjbxknpxq5v";
url = "http://qgis.org/downloads/${name}.tar.bz2";
sha256 = "0vlz1z3scj3k6nxf3hzfiq7k2773i6xvk6dvj4axs2f4njpnx7pr";
};
meta = {
@ -27,18 +22,4 @@ composableDerivation.composableDerivation {} {
# you can choose one of the following licenses:
license = [ "GPL" ];
};
phases = "unpackPhase buildPhase installPhase";
buildPhase = ''pwd; mkdir build; cd build; VERBOSE=1 cmake -DCMAKE_INSTALL_PREFIX=$out ''${cfgOption} ..'';
postUnpack = ''
export CMAKE_SYSTEM_LIBRARY_PATH=
for i in $buildInputs $propagatedBuildInputs; do
CMAKE_SYSTEM_LIBRARY_PATH=$i/lib:$CMAKE_SYSTEM_LIBRARY_PATH
done
'';
#configurePhase="./autogen.sh --prefix=\$out --with-gdal=\$gdal/bin/gdal-config --with-qtdir=\$qt";
# buildPhases="unpackPhase buildPhase";
}

View File

@ -0,0 +1,38 @@
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)

View File

@ -1,23 +0,0 @@
{qgis, fetchurl, sourceFromHead, python, sip}:
qgis.merge {
name = "qgis-trunk";
buildInputs = [ sip python ];
preConfigure = ''
export PYTHONPATH=$(toPythonPath ${sip})
'';
cfgOption = [
# without this option it can't find sqlite libs yet (missing symbols..) (TODO)
"-DWITH_INTERNAL_SQLITE3=TRUE"
"-DPYTHON_EXECUTABLE=${python}/bin/python"
];
# REGION AUTO UPDATE: { name="qgis"; type="svn"; url="https://svn.osgeo.org/qgis/trunk/qgis"; }
src = sourceFromHead "qgis-13572.tar.gz"
(fetchurl { url = "http://mawercer.de/~nix/repos/qgis-13572.tar.gz"; sha256 = "fd4c0e19919901cbee7ead7522acdbecbf17c5b9050e34ef91f8ea6e2736bec8"; });
# END
}

View File

@ -7466,26 +7466,7 @@ let
qt = qt4;
};
# doesn't compile yet - in case someone else want's to continue ..
# use Trunk because qgisReleased segfaults no resize for now
qgis = qgisTrunk;
qgisReleased = (import ../applications/misc/qgis) {
inherit composableDerivation fetchsvn stdenv flex lib
ncurses fetchurl perl cmake gdal geos proj x11
gsl libpng zlib bison
sqlite glibc fontconfig freetype /* use libc from stdenv ? - to lazy now - Marc */
python postgresql pyqt4;
inherit (xlibs) libSM libXcursor libXinerama libXrandr libXrender;
inherit (xorg) libICE;
qt = qt4;
# optional features
# grass = "not yet supported" # cmake -D WITH_GRASS=TRUE and GRASS_PREFX=..
};
qgisTrunk = callPackage ../applications/misc/qgis/trunk.nix {
qgis = qgisReleased;
};
qgis = callPackage ../applications/misc/qgis {};
yakuake = newScope pkgs.kde4 ../applications/misc/yakuake { };