mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 05:00:16 +00:00
Code Issues Wiki Activity

gdal: adding version 1.11.2 for merkaartor and openscenegraph

Browse source
This commit is contained in:
Michel Kuhlmann 2015-07-10 09:33:08 +02:00
parent 1278a8ff9b
commit e30c99d40a
4 changed files with 64 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/merkaartor/default.nix
View file

@ -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";

59
pkgs/development/libraries/gdal/gdal-1_11_2.nix Normal file
View file

@ -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;
};
})

2
pkgs/development/libraries/openscenegraph/default.nix
View file

@ -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

2
pkgs/top-level/all-packages.nix
View file

@ -6246,6 +6246,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 {};