diff --git a/pkgs/development/libraries/grpc/dynamic-lookup-darwin.patch b/pkgs/by-name/gr/grpc/dynamic-lookup-darwin.patch
similarity index 100%
rename from pkgs/development/libraries/grpc/dynamic-lookup-darwin.patch
rename to pkgs/by-name/gr/grpc/dynamic-lookup-darwin.patch
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/by-name/gr/grpc/package.nix
similarity index 100%
rename from pkgs/development/libraries/grpc/default.nix
rename to pkgs/by-name/gr/grpc/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58f4ab07d90a0..dcf75172c4124 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9210,9 +9210,9 @@ with pkgs;
   goocanvas = callPackage ../development/libraries/goocanvas { };
   goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { };
   goocanvas3 = callPackage ../development/libraries/goocanvas/3.x.nix { };
-  grpc = darwin.apple_sdk_11_0.callPackage ../development/libraries/grpc {
+  grpc = callPackage ../by-name/gr/grpc/package.nix {
     stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
-      then overrideSDK darwin.apple_sdk_11_0.stdenv { darwinMinVersion = "10.13"; }
+      then overrideSDK stdenv { darwinMinVersion = "10.13"; }
       else stdenv;
   };