nur-packages

commit a42c03ba84678353e457845fbbd9833297f5ec00
parent 3394ebc3a8595ed0e278ccf5cfe0ae683b7fd5b1
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Sat, 16 May 2020 23:46:08 +0300

openorienteering-mapper: fix qt wrapping

Diffstat:
M
pkgs/applications/openorienteering-mapper/default.nix
 | 
40
++++++++++++++++++----------------------

1 file changed, 18 insertions(+), 22 deletions(-)
diff --git 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 @@
 , proj
 , clipper
 , zlib
-, qtbase
 , qttools
 , qtlocation
 , qtsensors
@@ -18,7 +18,7 @@
 , sources
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "OpenOrienteering-Mapper";
   version = lib.substring 0 7 src.rev;
   src = sources.mapper;
@@ -30,19 +30,16 @@ stdenv.mkDerivation rec {
 
   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 @@ stdenv.mkDerivation rec {
 
   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