From 4c7db1c77a50f074cd758a12fb54afe5d62e08c6 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 6 Apr 2018 20:10:43 +0100 Subject: [PATCH 1/3] openorienteering-mapper: 0.8.1 -> 0.8.1.2 Fixes crashes on darwin --- pkgs/applications/gis/openorienteering-mapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 6eb7fba646cb..7401d98168d1 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "OpenOrienteering-Mapper-${version}"; - version = "0.8.1"; + version = "0.8.1.2"; buildInputs = [ gdal qtbase qttools qtlocation qtsensors clipper zlib proj doxygen cups]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "10viw8bddl76mc2gh84jsl7h237yzvh4nim61pbd63vg1hlqisi6"; + sha256 = "0f7zxzl2n46qy86k6n3f6a7l1nhba58i28l8ngp3drf74qffaa33"; }; cmakeFlags = From 0fe94a1258d25a83a690b7c6c6b62bcc61bce213 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 6 Apr 2018 20:13:47 +0100 Subject: [PATCH 2/3] 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 ''; From a2efd3e81cdf66cfdb61bd33585f4138ab4d8a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 8 Apr 2018 18:27:52 +0100 Subject: [PATCH 3/3] openorienteering-mapper: also enable linux --- pkgs/applications/gis/openorienteering-mapper/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index c85f39a4fb4e..7b79cd062a8c 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -55,14 +55,14 @@ stdenv.mkDerivation rec { ln -s $out/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper ''; - meta = { + meta = with stdenv.lib; { description = '' OpenOrienteering Mapper is an orienteering mapmaking program and provides a free alternative to the existing proprietary solution. ''; homepage = https://www.openorienteering.org/apps/mapper/; - license = stdenv.lib.licenses.gpl3; - platforms = with stdenv.lib.platforms; darwin; - maintainers = with stdenv.lib.maintainers; [mpickering]; + license = licenses.gpl3; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [mpickering]; }; }