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

Merge pull request #7450 from risicle/gdaldisablepy

Browse Source 
gdal: just disable python support instead of marking gdal broken wholesa...
This commit is contained in:
lethalman 2015-04-19 11:54:50 +02:00
commit e1db3adbac
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
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 ]
;
patches = [ patches = [
# This ensures that the python package is installed into gdal's prefix, # This ensures that the python package is installed into gdal's prefix,
@ -32,9 +37,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
]; ];
# Prevent this: # Prevent this: