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

merkaartor: fix build

Browse Source
This commit is contained in:
Jonathan Ringer 2019-07-11 04:58:46 -07:00
parent 3fbca39afa
commit f34face721
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/merkaartor/default.nix
View File

@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/merkaartor \ wrapProgram $out/bin/merkaartor \
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms

4
pkgs/top-level/all-packages.nix
View File

@ -19056,7 +19056,9 @@ in
mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { }; merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor {
gdal = gdal_2; # https://github.com/openstreetmap/merkaartor/issues/179
};
meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };