diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/by-name/os/osmscout-server/package.nix
similarity index 79%
rename from pkgs/applications/misc/osmscout-server/default.nix
rename to pkgs/by-name/os/osmscout-server/package.nix
index 00719698e9b8..abef0c0d53df 100644
--- a/pkgs/applications/misc/osmscout-server/default.nix
+++ b/pkgs/by-name/os/osmscout-server/package.nix
@@ -3,22 +3,18 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  qmake,
-  qttools,
-  wrapQtAppsHook,
   boost,
-  kirigami2,
+  libsForQt5,
   kyotocabinet,
   libmicrohttpd,
   libosmscout,
   libpostal,
   marisa,
   osrm-backend,
-  protobuf,
-  qtquickcontrols2,
-  qtlocation,
+  protobuf_21,
   sqlite,
   valhalla,
+  abseil-cpp_202103,
 }:
 
 let
@@ -28,6 +24,11 @@ let
     rev = "a45ea7c17b4a7f320e199b71436074bd624c9e15";
     hash = "sha256-Mq7Yd+y8M3JNG9BEScwVEmxGWYEy6gaNNSlTGgR9LB4=";
   };
+  protobuf' = protobuf_21.override {
+    abseil-cpp = abseil-cpp_202103.override {
+      cxxStandard = "17";
+    };
+  };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "osmscout-server";
@@ -42,16 +43,16 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    kirigami2
-    qtquickcontrols2
-    qtlocation
+    libsForQt5.kirigami2
+    libsForQt5.qtquickcontrols2
+    libsForQt5.qtlocation
     valhalla
     libosmscout
     osrm-backend
@@ -61,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     marisa
     kyotocabinet
     boost
-    protobuf
+    protobuf'
     date
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index feb7ee73aa85..e6ef0add7e5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10314,14 +10314,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server {
-    protobuf = protobuf_21.override {
-      abseil-cpp = abseil-cpp_202103.override {
-        cxxStandard = "17";
-      };
-    };
-  };
-
   pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { };
 
   pantalaimon-headless = callPackage ../applications/networking/instant-messengers/pantalaimon {