From bffe151d39139cd40f933a9e30dcd645ae90e58c Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 7 Dec 2024 08:58:47 -0800 Subject: [PATCH] tealdeer: move to pkgs/by-name --- .../tealdeer/default.nix => by-name/te/tealdeer/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{tools/misc/tealdeer/default.nix => by-name/te/tealdeer/package.nix} (93%) diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/by-name/te/tealdeer/package.nix similarity index 93% rename from pkgs/tools/misc/tealdeer/default.nix rename to pkgs/by-name/te/tealdeer/package.nix index 2de33cdd09b0..51d43799621e 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/by-name/te/tealdeer/package.nix @@ -3,7 +3,7 @@ , rustPlatform , fetchFromGitHub , installShellFiles -, Security +, apple-sdk_11 }: rustPlatform.buildRustPackage rec { @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ZKaq/JqH/Y2Cs9LLnlt1Gawe4R+kvS3vpUcNK95uujk="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea5a92dd4be6..ac662b01aa8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3229,10 +3229,6 @@ with pkgs; schleuder-cli = callPackage ../tools/security/schleuder/cli { }; - tealdeer = callPackage ../tools/misc/tealdeer { - inherit (darwin.apple_sdk.frameworks) Security; - }; - teamocil = callPackage ../tools/misc/teamocil { }; tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; };