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

Merge pull request #20242 from knedlsepp/activate-gdal-on-darwin

Browse Source 
gdal: fix darwin build
This commit is contained in:
Daiderd Jordan 2016-11-12 21:39:44 +01:00 committed by GitHub
commit c7defd149e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,14 +20,13 @@ composableDerivation.composableDerivation {} (fixed: rec {
hardeningDisable = [ "format" ];
# 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";
preConfigure = "unset CC CXX";
configureFlags = [
"--with-jpeg=${libjpeg.dev}"
"--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
"--with-libpng=${libpng.dev}" # optional
"--with-png=${libpng.dev}" # optional
"--with-libz=${zlib.dev}" # optional
"--with-pg=${postgresql}/bin/pg_config"
@ -53,6 +52,6 @@ composableDerivation.composableDerivation {} (fixed: rec {
homepage = http://www.gdal.org/;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
})

2
pkgs/development/libraries/libgeotiff/default.nix
View File

@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
homepage = http://www.remotesensing.org/geotiff/geotiff.html;
license = stdenv.lib.licenses.mit;
maintainers = [stdenv.lib.maintainers.marcweber];
platforms = stdenv.lib.platforms.linux;
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}