diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/by-name/me/merkaartor/package.nix similarity index 87% rename from pkgs/applications/misc/merkaartor/default.nix rename to pkgs/by-name/me/merkaartor/package.nix index 5d157382240e..03029a055a1b 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/by-name/me/merkaartor/package.nix @@ -3,14 +3,10 @@ , fetchFromGitHub , cmake , pkg-config -, qttools -, wrapQtAppsHook , gdal , proj , protobuf -, qtnetworkauth -, qtsvg -, qtwebengine +, qt5 , withGeoimage ? true, exiv2 , withGpsdlib ? (!stdenv.isDarwin), gpsd , withLibproxy ? false, libproxy @@ -28,9 +24,9 @@ stdenv.mkDerivation rec { hash = "sha256-oxLGhIE1qJ9+GOztD1HvrLGRGVO3gyy7Rc6CyzKTFec="; }; - nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config qt5.qttools qt5.wrapQtAppsHook ]; - buildInputs = [ gdal proj protobuf qtnetworkauth qtsvg qtwebengine ] + buildInputs = [ gdal proj protobuf qt5.qtnetworkauth qt5.qtsvg qt5.qtwebengine ] ++ lib.optional withGeoimage exiv2 ++ lib.optional withGpsdlib gpsd ++ lib.optional withLibproxy libproxy diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7deff9c7b8c4..32786879761a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31661,8 +31661,6 @@ with pkgs; mercurialFull = mercurial.override { fullBuild = true; }; - merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; - mepo = callPackage ../applications/misc/mepo { }; meshcentral = callPackage ../tools/admin/meshcentral { };