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

gdal: just disable python support instead of marking gdal broken wholesale

Browse Source
This commit is contained in:
Robert Scott 2015-04-18 20:36:34 +01:00
parent 88ce891dc8
commit f2e8e6a598
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/gdal/default.nix
View File

@ -1,6 +1,9 @@
{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl , postgresql, mysql, libgeotiff, proj, geos, openssl
, libpng }: , libpng
# disabling python for now
# , python, pythonPackages
}:
composableDerivation.composableDerivation {} (fixed: rec { composableDerivation.composableDerivation {} (fixed: rec {
version = "1.11.2"; version = "1.11.2";
@ -11,7 +14,9 @@ composableDerivation.composableDerivation {} (fixed: rec {
sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845"; sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
}; };
buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ]; buildInputs = [ unzip libjpeg libtiff libpng proj openssl ]
# ++ [ python pythonPackages.numpy ]
;
# Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults.
# Unset CC and CXX as they confuse libtool. # Unset CC and CXX as they confuse libtool.
@ -26,9 +31,11 @@ composableDerivation.composableDerivation {} (fixed: rec {
"--with-pg=${postgresql}/bin/pg_config" "--with-pg=${postgresql}/bin/pg_config"
"--with-mysql=${mysql.lib}/bin/mysql_config" "--with-mysql=${mysql.lib}/bin/mysql_config"
"--with-geotiff=${libgeotiff}" "--with-geotiff=${libgeotiff}"
"--with-python" # optional
"--with-static-proj4=${proj}" # optional "--with-static-proj4=${proj}" # optional
"--with-geos=${geos}/bin/geos-config"# optional "--with-geos=${geos}/bin/geos-config"# optional
# Enabling built-in python bindings causes
# http://hydra.nixos.org/build/21344907/nixlog/1/raw - disable for now
#"--with-python" # optional
]; ];
meta = { meta = {
@ -37,6 +44,5 @@ composableDerivation.composableDerivation {} (fixed: rec {
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.marcweber ]; maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
broken = true; # http://hydra.nixos.org/build/21344907/nixlog/1/raw
}; };
}) })