public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t/gis/qgis

Browse Source 
updating qgis

Signed-off-by: Marc Weber <marco-oweber@gmx.de>

svn path=/nixpkgs/trunk/; revision=22115
This commit is contained in:
Marc Weber 2010-06-03 00:51:23 +00:00
parent 0d6228fa83
commit 0be243e26d
3 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/qgis/1.0.1-2.nix → pkgs/applications/misc/qgis/default.nix
View File

@ -6,19 +6,19 @@ let inherit (builtins) getAttr;
in in
composableDerivation.composableDerivation {} { composableDerivation.composableDerivation {} {
buildInputs = [ gdal cmake qt flex bison proj geos x11 sqlite gsl]; buildInputs = [ gdal cmake qt flex bison proj geos x11 sqlite gsl pyqt4];
cfgOption = [ cfgOption = [
# without this option it can't find sqlite libs yet (missing symbols..) (TODO) # without this option it can't find sqlite libs yet (missing symbols..) (TODO)
"-DWITH_INTERNAL_SQLITE3=TRUE" "-DWITH_INTERNAL_SQLITE3=TRUE"
]; ];
name = "qgis-1.0.1-2"; name = "qgis-1.4.0";
# src = args.fetchsvn { url=https://svn.qgis.org/repos/qgis/trunk/qgis; # src = args.fetchsvn { url=https://svn.qgis.org/repos/qgis/trunk/qgis;
# md5="ac0560e0a2d4e6258c8639f1e9b56df3"; rev="7704"; }; # md5="ac0560e0a2d4e6258c8639f1e9b56df3"; rev="7704"; };
src = fetchurl { src = fetchurl {
url = "http://download.osgeo.org/qgis/src/qgis_1.0.1-2.tar.gz"; url = http://download.osgeo.org/qgis/src/qgis_1.4.0.tar.gz;
sha256 = "07yyic9sn1pz20wjk7k560jwqz6b19rhf2gawybz38xq1f8rjwd4"; sha256 = "1nn71j9pnkqcprwvzqnybh6ybl0zp50jj04lm769bnjbxknpxq5v";
}; };
meta = { meta = {

23
pkgs/applications/misc/qgis/trunk.nix Normal file
View File

@ -0,0 +1,23 @@
{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
}

12
pkgs/top-level/all-packages.nix
View File

@ -8978,11 +8978,14 @@ let
}; };
# doesn't compile yet - in case someone else want's to continue .. # doesn't compile yet - in case someone else want's to continue ..
qgis = (import ../applications/misc/qgis/1.0.1-2.nix) { # use Trunk because qgisReleased segfaults no resize for now
qgis = qgisTrunk;
qgisReleased = (import ../applications/misc/qgis) {
inherit composableDerivation fetchsvn stdenv flex lib inherit composableDerivation fetchsvn stdenv flex lib
ncurses fetchurl perl cmake gdal geos proj x11 ncurses fetchurl perl cmake gdal geos proj x11
gsl libpng zlib bison gsl libpng zlib bison
sqlite glibc fontconfig freetype /* use libc from stdenv ? - to lazy now - Marc */; sqlite glibc fontconfig freetype /* use libc from stdenv ? - to lazy now - Marc */
python postgresql pyqt4;
inherit (xlibs) libSM libXcursor libXinerama libXrandr libXrender; inherit (xlibs) libSM libXcursor libXinerama libXrandr libXrender;
inherit (xorg) libICE; inherit (xorg) libICE;
qt = qt4; qt = qt4;
@ -8991,6 +8994,11 @@ let
# grass = "not yet supported" # cmake -D WITH_GRASS=TRUE and GRASS_PREFX=.. # grass = "not yet supported" # cmake -D WITH_GRASS=TRUE and GRASS_PREFX=..
}; };
qgisTrunk = (import ../applications/misc/qgis/trunk.nix) {
inherit fetchurl sourceFromHead python sip;
qgis = qgisReleased;
};
zapping = import ../applications/video/zapping { zapping = import ../applications/video/zapping {
inherit fetchurl stdenv pkgconfig perl python inherit fetchurl stdenv pkgconfig perl python
gettext zvbi libjpeg libpng x11 gettext zvbi libjpeg libpng x11