diff --git a/pkgs/applications/openorienteering-mapper/default.nix b/pkgs/applications/openorienteering-mapper/default.nix

index 8174eda814419d9276997e7d6a27166a82ee13cd..857bbd3a5cf6dc978311063723a46a12c31f3a63 100644

--- a/pkgs/applications/openorienteering-mapper/default.nix

+++ b/pkgs/applications/openorienteering-mapper/default.nix

@@ -1,4 +1,5 @@

{ stdenv

+, mkDerivation

, lib

, gdal

, cmake

@@ -6,7 +7,6 @@ , ninja

, proj

, clipper

, zlib

-, qtbase

, qttools

, qtlocation

, qtsensors

@@ -18,7 +18,7 @@ , qtimageformats

, sources

}:

-stdenv.mkDerivation rec {

+mkDerivation rec {

pname = "OpenOrienteering-Mapper";

version = lib.substring 0 7 src.rev;

src = sources.mapper;

@@ -30,19 +30,16 @@ ];

buildInputs = [

 gdal

• qtbase

• qttools

 qtlocation

 qtimageformats

 qtsensors

 clipper

 zlib

 proj

• doxygen

 cups

];

• nativeBuildInputs = [ cmake wrapQtAppsHook ninja ];

• nativeBuildInputs = [ cmake doxygen ninja qttools ];

postPatch = ''

 substituteInPlace src/util/translation_util.cpp \

@@ -51,24 +48,23 @@ '';

cmakeFlags = [

 # Building the manual and bundling licenses fails

• See https://github.com/NixOS/nixpkgs/issues/85306

 "-DLICENSING_PROVIDER:BOOL=OFF"

 "-DMapper_MANUAL_QTHELP:BOOL=OFF"

• ] ++ (

• lib.optionals stdenv.isDarwin [

•  # Usually enabled on Darwin
  

•  "-DCMAKE_FIND_FRAMEWORK=never"
  

•  # FindGDAL is broken and always finds /Library/Framework unless this is
  

•  # specified
  

•  "-DGDAL_INCLUDE_DIR=${gdal}/include"
  

•  "-DGDAL_CONFIG=${gdal}/bin/gdal-config"
  

•  "-DGDAL_LIBRARY=${gdal}/lib/libgdal.dylib"
  

•  # Don't bundle libraries
  

•  "-DMapper_PACKAGE_PROJ=0"
  

•  "-DMapper_PACKAGE_QT=0"
  

•  "-DMapper_PACKAGE_ASSISTANT=0"
  

•  "-DMapper_PACKAGE_GDAL=0"
  

• ]

• );

• ] ++ lib.optionals stdenv.isDarwin [

• Usually enabled on Darwin

• "-DCMAKE_FIND_FRAMEWORK=never"

• FindGDAL is broken and always finds /Library/Framework unless this is

• specified

• "-DGDAL_INCLUDE_DIR=${gdal}/include"

• "-DGDAL_CONFIG=${gdal}/bin/gdal-config"

• "-DGDAL_LIBRARY=${gdal}/lib/libgdal.dylib"

• Don't bundle libraries

• "-DMapper_PACKAGE_PROJ=0"

• "-DMapper_PACKAGE_QT=0"

• "-DMapper_PACKAGE_ASSISTANT=0"

• "-DMapper_PACKAGE_GDAL=0"

• ];

postInstall = lib.optionalString stdenv.isDarwin ''

 mkdir -p $out/Applications