From 8079fe3967fcf57076667f5024b1022b810e7c8f Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 9 Nov 2024 21:49:09 -0800 Subject: [PATCH] cocogitto: use new Darwin SDK pattern --- pkgs/development/tools/cocogitto/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 848b6fb2f10d..27d55e1c159f 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, libgit2 }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, libgit2 }: rustPlatform.buildRustPackage rec { pname = "cocogitto"; @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { owner = "oknozor"; repo = pname; rev = version; - sha256 = "sha256-yGwGWXME9ZjFJk/3pVDRTa1phG6kd8+YhXe/MxOEdF0="; + hash = "sha256-yGwGWXME9ZjFJk/3pVDRTa1phG6kd8+YhXe/MxOEdF0="; }; cargoHash = "sha256-iS/nRfy63bgo7MeL/5jJ3Vn6S7dG49erIZ+0516YxKM="; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ libgit2 ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ libgit2 ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cog \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 951e228ceed4..6b3898abc936 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -299,9 +299,7 @@ with pkgs; perlPackages = perl538Packages; }; - cocogitto = callPackage ../development/tools/cocogitto { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cocogitto = callPackage ../development/tools/cocogitto { }; coldsnap = callPackage ../tools/admin/coldsnap { inherit (darwin.apple_sdk.frameworks) Security;