diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 932e5bb48300..221b459f84aa 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, boost, proj, gdal}: +{stdenv, fetchurl, qt4, boost, proj, gdal_1_11_2}: stdenv.mkDerivation rec { name = "merkaartor-0.18.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { qmake -makefile PREFIX=$out ''; - buildInputs = [ qt4 boost proj gdal ]; + buildInputs = [ qt4 boost proj gdal_1_11_2 ]; meta = { description = "An openstreetmap editor"; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index fe7d0869fbd0..22a721191dda 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -3,12 +3,12 @@ , libpng }: composableDerivation.composableDerivation {} (fixed: rec { - version = "1.11.2"; + version = "2.0.0"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; - sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845"; + sha256 = "53761563ff53c5bf27bff7c4d6cab8bb1634baccefda05348e0f3b7acaf4c9e6"; }; buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ]; diff --git a/pkgs/development/libraries/gdal/gdal-1_11_2.nix b/pkgs/development/libraries/gdal/gdal-1_11_2.nix new file mode 100644 index 000000000000..fe7d0869fbd0 --- /dev/null +++ b/pkgs/development/libraries/gdal/gdal-1_11_2.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib +, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl +, libpng }: + +composableDerivation.composableDerivation {} (fixed: rec { + version = "1.11.2"; + name = "gdal-${version}"; + + src = fetchurl { + url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; + sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845"; + }; + + buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ]; + + patches = [ + # This ensures that the python package is installed into gdal's prefix, + # rather than trying to install into python's prefix. + ./python.patch + ]; + + # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. + # Unset CC and CXX as they confuse libtool. + preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX"; + + configureFlags = [ + "--with-jpeg=${libjpeg}" + "--with-libtiff=${libtiff}" # optional (without largetiff support) + "--with-libpng=${libpng}" # optional + "--with-libz=${zlib}" # optional + + "--with-pg=${postgresql}/bin/pg_config" + "--with-mysql=${mysql.lib}/bin/mysql_config" + "--with-geotiff=${libgeotiff}" + "--with-python" # optional + "--with-static-proj4=${proj}" # optional + "--with-geos=${geos}/bin/geos-config"# optional + ]; + + # Prevent this: + # + # Checking .pth file support in /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ + # /nix/store/pbi1lgank10fy0xpjckbdpgacqw34dsz-python-2.7.9/bin/python -E -c pass + # TEST FAILED: /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ does NOT support .pth files + # error: bad install directory or PYTHONPATH + preBuild = '' + pythonInstallDir=$out/lib/${python.libPrefix}/site-packages + mkdir -p $pythonInstallDir + export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir + ''; + + meta = { + description = "Translator library for raster geospatial data formats"; + homepage = http://www.gdal.org/; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; + }; +}) diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 9be9f8386326..5fb73eae276a 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,6 +1,6 @@ x@{builderDefsPackage , cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng - , coin3d, jasper, gdal, xproto, libX11, libXmu, freeglut, mesa + , coin3d, jasper, gdal_1_11_2, xproto, libX11, libXmu, freeglut, mesa , doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2 , curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL , qt4, poppler, librsvg, gtk diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1f5961f3058..268b9b964338 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6250,6 +6250,8 @@ let gdal = callPackage ../development/libraries/gdal { }; + gdal_1_11_2 = callPackage ../development/libraries/gdal/gdal-1_11_2.nix { }; + gdcm = callPackage ../development/libraries/gdcm { }; ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {};