public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rink: fix darwin build (#123501)

Browse Source
This commit is contained in:
Stéphan Kochen 2021-05-18 16:34:25 +02:00 committed by GitHub
parent 4bb1c4677d
commit 7e9451ffb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/science/misc/rink/default.nix
View File

@ -1,4 +1,5 @@
{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }: { lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses
, libiconv, Security }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
version = "0.6.1"; version = "0.6.1";
@ -14,7 +15,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0x4rvfnw3gl2aj6i006nkk3y1f8skyv8g0ss3z2v6qj9nhs7pyir"; cargoSha256 = "0x4rvfnw3gl2aj6i006nkk3y1f8skyv8g0ss3z2v6qj9nhs7pyir";
nativeBuildInputs = [ pkg-config ]; 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. # Some tests fail and/or attempt to use internet servers.
doCheck = false; doCheck = false;

4
pkgs/top-level/all-packages.nix
View File

@ -29830,7 +29830,9 @@ in
stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else gcc8Stdenv; 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 { }; simgrid = callPackage ../applications/science/misc/simgrid { };