openorienteering-mapper: migrate to by-name

This commit is contained in:
Nikolay Korotkiy 2024-02-22 21:57:11 +04:00
parent ce2f3c81a0
commit 6e7184b10f
No known key found for this signature in database
GPG Key ID: D1DE6D7F693663A5
2 changed files with 7 additions and 12 deletions

View File

@ -1,6 +1,5 @@
{ lib { lib
, stdenv , stdenv
, mkDerivation
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, clipper , clipper
@ -10,14 +9,11 @@
, gdal , gdal
, ninja , ninja
, proj , proj
, qtimageformats , qt5
, qtlocation
, qtsensors
, qttools
, zlib , zlib
}: }:
mkDerivation rec { stdenv.mkDerivation rec {
pname = "OpenOrienteering-Mapper"; pname = "OpenOrienteering-Mapper";
version = "0.9.5"; version = "0.9.5";
@ -40,7 +36,8 @@ mkDerivation rec {
cmake cmake
doxygen doxygen
ninja ninja
qttools qt5.qttools
qt5.wrapQtAppsHook
]; ];
buildInputs = [ buildInputs = [
@ -48,9 +45,9 @@ mkDerivation rec {
cups cups
gdal gdal
proj proj
qtimageformats qt5.qtimageformats
qtlocation qt5.qtlocation
qtsensors qt5.qtsensors
zlib zlib
]; ];

View File

@ -30091,8 +30091,6 @@ with pkgs;
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
}; };
openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { };
qgis-ltr = callPackage ../applications/gis/qgis/ltr.nix { }; qgis-ltr = callPackage ../applications/gis/qgis/ltr.nix { };
qgis = callPackage ../applications/gis/qgis { }; qgis = callPackage ../applications/gis/qgis { };