diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/by-name/op/opencpn/package.nix
similarity index 98%
rename from pkgs/applications/misc/opencpn/default.nix
rename to pkgs/by-name/op/opencpn/package.nix
index 6fe8c40be81f..7a24815f0e6e 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/by-name/op/opencpn/package.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  DarwinTools,
+  darwin,
   alsa-utils,
   at-spi2-core,
   cmake,
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     lsb-release
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    DarwinTools
+    darwin.DarwinTools
     makeWrapper
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53ce8a608ea4..6372c205ee79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9684,10 +9684,6 @@ with pkgs;
   obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins { });
   wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { };
 
-  opencpn = callPackage ../applications/misc/opencpn {
-    inherit (darwin) DarwinTools;
-  };
-
   open-music-kontrollers = recurseIntoAttrs {
     eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { };
     jit = callPackage ../applications/audio/open-music-kontrollers/jit.nix { };