diff options
| author | Peter Simons <simons@cryp.to> | 2015-01-14 09:30:35 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-01-14 09:30:35 +0100 |
| commit | 0f31f8a9f3cc0d76b5b5166657fca570834333af (patch) | |
| tree | 2e610248cc3e4179bde939291a12700cc2c5bd16 | |
| parent | 0351b7a71080cea92a3ea49995d30fb2a16c6e01 (diff) | |
| parent | b3d33d398c23295d10cf79448e549a034b6d619e (diff) | |
Merge pull request #5761 from benley/fix-gdal
gdal: fix the build
| -rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 4a4ebf11e2d01..b0feb2b600831 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -10,14 +10,15 @@ composableDerivation.composableDerivation {} (fixed: rec { sha256 = "0h1kib2pzv4nbppdnxv6vhngvk9ic531y8rzcwb8bg6am125jszl"; }; - buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj]; + buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj ]; - # don't use optimization for gcc >= 4.3. That's said to be causeing segfaults - preConfigure = "export CFLAGS=-O0; export CXXFLAGS=-O0"; + # 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-libtiff=${libtiff}" # optional (without largetiff support) "--with-libz=${zlib}" # optional "--with-pg=${postgresql}/bin/pg_config" @@ -33,6 +34,5 @@ composableDerivation.composableDerivation {} (fixed: rec { license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; - broken = true; }; }) |