Author: urkud
Date: Thu Aug 11 09:35:17 2011
New Revision: 28483
URL: https://svn.nixos.org/websvn/nix/?rev=28483&sc=1
Log:
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.
Added:
nixpkgs/trunk/pkgs/applications/misc/qgis/r14988.diff
Deleted:
nixpkgs/trunk/pkgs/applications/misc/qgis/trunk.nix
Modified:
nixpkgs/trunk/pkgs/applications/misc/qgis/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/qgis/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/qgis/default.nix Thu Aug 11
09:35:10 2011 (r28482)
+++ nixpkgs/trunk/pkgs/applications/misc/qgis/default.nix Thu Aug 11
09:35:17 2011 (r28483)
@@ -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 {} {
-
- 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, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite,
gsl,
+ pyqt4, qwt, fcgi, python }:
- name = "qgis-1.4.0";
+stdenv.mkDerivation rec {
+ name = "qgis-1.6.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 @@
# 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";
-
}
Added: nixpkgs/trunk/pkgs/applications/misc/qgis/r14988.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/misc/qgis/r14988.diff Thu Aug 11
09:35:17 2011 (r28483)
@@ -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)
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 11 09:35:10
2011 (r28482)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 11 09:35:17
2011 (r28483)
@@ -7466,26 +7466,7 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
