From 7e9451ffb325698b7192e5eb30b051cc5ac96a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 16:34:25 +0200 Subject: [PATCH] rink: fix darwin build (#123501) --- pkgs/applications/science/misc/rink/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 232e13218cb..fcacaefca44 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -1,4 +1,5 @@ -{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses +, libiconv, Security }: rustPlatform.buildRustPackage rec { version = "0.6.1"; @@ -14,7 +15,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0x4rvfnw3gl2aj6i006nkk3y1f8skyv8g0ss3z2v6qj9nhs7pyir"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ncurses ]; + buildInputs = [ ncurses ] + ++ (if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]); # Some tests fail and/or attempt to use internet servers. doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e012152dd3a..558da9787c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29830,7 +29830,9 @@ in stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else gcc8Stdenv; }); - rink = callPackage ../applications/science/misc/rink { }; + rink = callPackage ../applications/science/misc/rink { + inherit (darwin.apple_sdk.frameworks) Security; + }; simgrid = callPackage ../applications/science/misc/simgrid { };