From 2b394ff638b770eb15e9c0d0d28abed64ea144d6 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 14 May 2023 17:14:50 -0400 Subject: [PATCH] tickrs: fix build on darwin --- pkgs/applications/misc/tickrs/default.nix | 25 ++++++++++++++++++++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index b28a740501b..dcddaab34d7 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, perl, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, zlib +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "tickrs"; @@ -13,9 +21,20 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-fOYxOiVpgflwIz9Z6ePhQKDa7DX4D/ZCnPOwq9vWOSk="; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ + pkg-config + ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + env = { + OPENSSL_NO_VENDOR = true; + }; meta = with lib; { description = "Realtime ticker data in your terminal"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90c7edefc91..da8523d8b66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34350,9 +34350,7 @@ with pkgs; ticker = callPackage ../applications/misc/ticker { }; - tickrs = callPackage ../applications/misc/tickrs { - inherit (darwin.apple_sdk.frameworks) Security; - }; + tickrs = callPackage ../applications/misc/tickrs { }; tilemaker = callPackage ../applications/misc/tilemaker { };