Revert "Merge pull request #7450 from risicle/gdaldisablepy"
This reverts commite1db3adbac
, reversing changes made toca0d1aa9a3
. See https://github.com/NixOS/nixpkgs/pull/7450#issuecomment-94259269
This commit is contained in:
parent
e1db3adbac
commit
b247577487
|
@ -1,9 +1,6 @@
|
|||
{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
|
||||
, postgresql, mysql, libgeotiff, proj, geos, openssl
|
||||
, libpng
|
||||
# disabling python for now
|
||||
# , python, pythonPackages
|
||||
}:
|
||||
, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl
|
||||
, libpng }:
|
||||
|
||||
composableDerivation.composableDerivation {} (fixed: rec {
|
||||
version = "1.11.2";
|
||||
|
@ -14,9 +11,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
|
|||
sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip libjpeg libtiff libpng proj openssl ]
|
||||
# ++ [ python pythonPackages.numpy ]
|
||||
;
|
||||
buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ];
|
||||
|
||||
patches = [
|
||||
# This ensures that the python package is installed into gdal's prefix,
|
||||
|
@ -37,11 +32,9 @@ composableDerivation.composableDerivation {} (fixed: rec {
|
|||
"--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
|
||||
# Enabling built-in python bindings causes
|
||||
# http://hydra.nixos.org/build/21344907/nixlog/1/raw - disable for now
|
||||
#"--with-python" # optional
|
||||
];
|
||||
|
||||
# Prevent this:
|
||||
|
|
Loading…
Reference in New Issue
Block a user