diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/by-name/re/rethinkdb/package.nix
similarity index 85%
rename from pkgs/servers/nosql/rethinkdb/default.nix
rename to pkgs/by-name/re/rethinkdb/package.nix
index f6842768af6a..c3891fa61551 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/by-name/re/rethinkdb/package.nix
@@ -1,27 +1,29 @@
 {
   lib,
-  stdenv,
+  clangStdenv,
   fetchurl,
   which,
   m4,
-  protobuf,
+  protobuf_21,
   boost,
   zlib,
   curl,
   openssl,
   icu,
   jemalloc,
-  libtool,
+  cctools,
   python3Packages,
   makeWrapper,
 }:
-
-stdenv.mkDerivation rec {
+let
+  stdenv = clangStdenv;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "rethinkdb";
   version = "2.4.4";
 
   src = fetchurl {
-    url = "https://download.rethinkdb.com/repository/raw/dist/${pname}-${version}.tgz";
+    url = "https://download.rethinkdb.com/repository/raw/dist/rethinkdb-${finalAttrs.version}.tgz";
     hash = "sha256-UJEjdgK2KDDbLLParKarNGMjI3QeZxDC8N5NhPRCcR8=";
   };
 
@@ -44,7 +46,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "rethinkdb" ];
 
   buildInputs = [
-    protobuf
+    protobuf_21
     boost
     zlib
     curl
@@ -52,7 +54,7 @@ stdenv.mkDerivation rec {
     icu
   ]
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) jemalloc
-  ++ lib.optional stdenv.hostPlatform.isDarwin libtool;
+  ++ lib.optional stdenv.hostPlatform.isDarwin cctools;
 
   nativeBuildInputs = [
     which
@@ -84,4 +86,4 @@ stdenv.mkDerivation rec {
       thoughtpolice
     ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fcd7247313a4..ebf46bed3ca2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8439,12 +8439,6 @@ with pkgs;
 
   pypiserver = with python3Packages; toPythonApplication pypiserver;
 
-  rethinkdb = callPackage ../servers/nosql/rethinkdb {
-    stdenv = clangStdenv;
-    libtool = cctools;
-    protobuf = protobuf_21;
-  };
-
   samba4 = callPackage ../servers/samba/4.x.nix { };
 
   samba = samba4;