From 8e8f6c00e85cf1beb457917ccd9a14d064f4bd41 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 18 Oct 2024 22:35:45 +1000 Subject: [PATCH] ripgrep: switch to apple-sdk_11 --- pkgs/tools/text/ripgrep/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index e3270f359f1b..c6d3884921be 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -4,7 +4,7 @@ , rustPlatform , installShellFiles , pkg-config -, Security +, apple-sdk_11 , withPCRE2 ? true , pcre2 }: @@ -28,7 +28,7 @@ in rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ] ++ lib.optional withPCRE2 pkg-config; buildInputs = lib.optional withPCRE2 pcre2 - ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; buildFeatures = lib.optional withPCRE2 "pcre2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7363ee90946..324161235eb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8072,9 +8072,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - ripgrep = callPackage ../tools/text/ripgrep { - inherit (darwin.apple_sdk.frameworks) Security; - }; + ripgrep = callPackage ../tools/text/ripgrep { }; ripgrep-all = callPackage ../tools/text/ripgrep-all { inherit (darwin.apple_sdk.frameworks) Security;