git.iko.soy/typeable/nixpkgs
on master help sign in
rink: fix darwin build (#123501)
commit7e9451ffb325698b7192e5eb30b051cc5ac96a5c authorStéphan Kochen <git@stephank.nl> dateTue 18 May 2021, 16:34 (6 years ago) parent4bb1c46
2 files changed+7−3
pkgs/applications/science/misc/rink/default.nix+4−2 pkgs/top-level/all-packages.nix+3−1
pkgs/applications/science/misc/rink/default.nix+4−2
@@ -1,4 +1,5 @@
1−{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }:
1+{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses
2+, libiconv, Security }:
23
34rustPlatform.buildRustPackage rec {
45 version = "0.6.1";
@@ -14,7 +15,8 @@ rustPlatform.buildRustPackage rec {
1415 cargoSha256 = "0x4rvfnw3gl2aj6i006nkk3y1f8skyv8g0ss3z2v6qj9nhs7pyir";
1516
1617 nativeBuildInputs = [ pkg-config ];
17− buildInputs = [ openssl ncurses ];
18+ buildInputs = [ ncurses ]
19+ ++ (if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]);
1820
1921 # Some tests fail and/or attempt to use internet servers.
2022 doCheck = false;
pkgs/top-level/all-packages.nix+3−1
@@ -29830,7 +29830,9 @@ in
2983029830 stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else gcc8Stdenv;
2983129831 });
2983229832
29833− rink = callPackage ../applications/science/misc/rink { };
29833+ rink = callPackage ../applications/science/misc/rink {
29834+ inherit (darwin.apple_sdk.frameworks) Security;
29835+ };
2983429836
2983529837 simgrid = callPackage ../applications/science/misc/simgrid { };
2983629838