Merge pull request #231920 from figsoda/tickrs

tickrs: fix build on darwin

authored by

Robert Scott and committed by
GitHub
26fb2783 7b0ef853

+23 -6
+22 -3
pkgs/applications/misc/tickrs/default.nix
··· 1 - { lib, stdenv, rustPlatform, fetchFromGitHub, perl, Security }: 1 + { lib 2 + , rustPlatform 3 + , fetchFromGitHub 4 + , pkg-config 5 + , openssl 6 + , zlib 7 + , stdenv 8 + , darwin 9 + }: 2 10 3 11 rustPlatform.buildRustPackage rec { 4 12 pname = "tickrs"; ··· 13 21 14 22 cargoHash = "sha256-fOYxOiVpgflwIz9Z6ePhQKDa7DX4D/ZCnPOwq9vWOSk="; 15 23 16 - nativeBuildInputs = [ perl ]; 24 + nativeBuildInputs = [ 25 + pkg-config 26 + ]; 17 27 18 - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; 28 + buildInputs = [ 29 + openssl 30 + zlib 31 + ] ++ lib.optionals stdenv.isDarwin [ 32 + darwin.apple_sdk.frameworks.SystemConfiguration 33 + ]; 34 + 35 + env = { 36 + OPENSSL_NO_VENDOR = true; 37 + }; 19 38 20 39 meta = with lib; { 21 40 description = "Realtime ticker data in your terminal";
+1 -3
pkgs/top-level/all-packages.nix
··· 34364 34364 34365 34365 ticker = callPackage ../applications/misc/ticker { }; 34366 34366 34367 - tickrs = callPackage ../applications/misc/tickrs { 34368 - inherit (darwin.apple_sdk.frameworks) Security; 34369 - }; 34367 + tickrs = callPackage ../applications/misc/tickrs { }; 34370 34368 34371 34369 tilemaker = callPackage ../applications/misc/tilemaker { }; 34372 34370