From 0fe94a1258d25a83a690b7c6c6b62bcc61bce213 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 6 Apr 2018 20:13:47 +0100 Subject: [PATCH] openorienteering-mapper: Load additional image formats This allows tiff images to be loaded correctly as templates. --- pkgs/applications/gis/openorienteering-mapper/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 7401d98168d1..c85f39a4fb4e 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchFromGitHub, gdal, cmake, ninja, proj, clipper, zlib, qtbase, qttools - , qtlocation, qtsensors, doxygen, cups, makeWrapper + , qtlocation, qtsensors, doxygen, cups, makeWrapper, qtimageformats }: stdenv.mkDerivation rec { name = "OpenOrienteering-Mapper-${version}"; version = "0.8.1.2"; - buildInputs = [ gdal qtbase qttools qtlocation qtsensors clipper zlib proj doxygen cups]; + buildInputs = [ gdal qtbase qttools qtlocation qtimageformats + qtsensors clipper zlib proj doxygen cups]; nativeBuildInputs = [ cmake makeWrapper ninja ]; @@ -48,7 +49,8 @@ stdenv.mkDerivation rec { # Fixes "This application failed to start because it could not find or load the Qt # platform plugin "cocoa"." wrapProgram $out/Mapper.app/Contents/MacOS/Mapper \ - --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms + --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms \ + --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtimageformats}/${qtbase.qtPluginPrefix} mkdir -p $out/bin ln -s $out/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper '';