From 580741f0fa29e698ee6b88af35b917e1e3c00ea8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 18 Oct 2024 22:35:44 +1000 Subject: [PATCH] git-interactive-rebase-tool: switch to apple-sdk_11 --- .../git-interactive-rebase-tool/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix index 835b6ddf8514..fef465d9446e 100644 --- a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, apple-sdk_11 }: rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv apple-sdk_11 ]; # Compilation during tests fails if this env var is not set. preCheck = "export GIRT_BUILD_GIT_HASH=${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1134583fd989..834f4b4d8ecd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2245,9 +2245,7 @@ with pkgs; git-imerge = python3Packages.callPackage ../applications/version-management/git-imerge { }; - git-interactive-rebase-tool = callPackage ../applications/version-management/git-interactive-rebase-tool { - inherit (darwin.apple_sdk.frameworks) Security; - }; + git-interactive-rebase-tool = callPackage ../applications/version-management/git-interactive-rebase-tool { }; git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { });