diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-07-15 21:14:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-15 21:14:04 +0200 |
| commit | 800da69c8a5eae83bceee98af0c09e1b3440b3bf (patch) | |
| tree | ca631e2a86d5e6bb40e95d6fa13c79b0d4d8940b /pkgs/applications/misc | |
| parent | 2e1a90e5d018a5e6b1dc1b5b3c726d6be26b22f8 (diff) | |
| parent | e6223c022b94fad4b85e88319515d6f58910b5d7 (diff) | |
| download | nixlib-800da69c8a5eae83bceee98af0c09e1b3440b3bf.tar nixlib-800da69c8a5eae83bceee98af0c09e1b3440b3bf.tar.gz nixlib-800da69c8a5eae83bceee98af0c09e1b3440b3bf.tar.bz2 nixlib-800da69c8a5eae83bceee98af0c09e1b3440b3bf.tar.lz nixlib-800da69c8a5eae83bceee98af0c09e1b3440b3bf.tar.xz nixlib-800da69c8a5eae83bceee98af0c09e1b3440b3bf.tar.zst nixlib-800da69c8a5eae83bceee98af0c09e1b3440b3bf.zip | |
Merge pull request #64551 from jonringer/update-pyproj
proj: 5.2.0 -> 6.1.1
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/merkaartor/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/osm2xmap/default.nix | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 0833464f2c25..dec55e9c1e5c 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; + postInstall = '' wrapProgram $out/bin/merkaartor \ --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 5787adef2a3e..9d0fb3fdeb7c 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { "INSTALL_SHAREDIR=$(out)/share/" ]; + NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; + installFlags = [ "DESTDIR=$(out)" ]; buildInputs = [ libroxml proj libyamlcpp boost ]; |