diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 6ee2a1511261..b73fb71f698f 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -1,45 +1,33 @@ -{ lib, stdenv +{ lib +, stdenv , mkDerivation , fetchFromGitHub , fetchpatch -, substituteAll -, gdal +, clipper , cmake +, cups +, doxygen +, gdal , ninja , proj -, clipper -, zlib -, qttools +, qtimageformats , qtlocation , qtsensors +, qttools , qttranslations -, doxygen -, cups -, qtimageformats +, substituteAll +, zlib }: mkDerivation rec { pname = "OpenOrienteering-Mapper"; version = "0.9.5"; - buildInputs = [ - gdal - qtlocation - qtimageformats - qtsensors - clipper - zlib - proj - cups - ]; - - nativeBuildInputs = [ cmake doxygen ninja qttools ]; - src = fetchFromGitHub { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "1w8ikqpgi0ksrzjal5ihfaik4grc5v3gdnnv79j20xkr2p4yn1h5"; + hash = "sha256-BQbryRV5diBkOtva9sYuLD8yo3IwFqrkz3qC+C6eEfE="; }; patches = [ @@ -55,6 +43,24 @@ mkDerivation rec { }) ]; + nativeBuildInputs = [ + cmake + doxygen + ninja + qttools + ]; + + buildInputs = [ + clipper + cups + gdal + proj + qtimageformats + qtlocation + qtsensors + zlib + ]; + cmakeFlags = [ # Building the manual and bundling licenses fails # See https://github.com/NixOS/nixpkgs/issues/85306 @@ -81,15 +87,12 @@ mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; - 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/"; + description = "An orienteering mapmaking program"; changelog = "https://github.com/OpenOrienteering/mapper/releases/tag/v${version}"; license = licenses.gpl3Plus; - platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ mpickering sikmir ]; + platforms = with platforms; unix; + broken = stdenv.isDarwin; }; }