From c2525c85faca142c7cc49b4a163334aa92daac11 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 3 Jan 2025 18:09:13 +0100 Subject: [PATCH] grpc: move to pkgs/by-name --- .../libraries => by-name/gr}/grpc/dynamic-lookup-darwin.patch | 0 .../grpc/default.nix => by-name/gr/grpc/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{development/libraries => by-name/gr}/grpc/dynamic-lookup-darwin.patch (100%) rename pkgs/{development/libraries/grpc/default.nix => by-name/gr/grpc/package.nix} (100%) 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; };