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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-16 01:00:58 +00:00
committed by GitHub
parent f1b78f8618 8ceb0380a2
commit b484cef365
41 changed files with 3677 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/interpreters/evcxr/default.nix
View File

@@ -1,4 +1,5 @@
{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, lib, stdenv, gcc, Security, cmake }:
{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, lib, stdenv
, gcc, cmake, libiconv, CoreServices, Security }:
rustPlatform.buildRustPackage rec {
pname = "evcxr";
@@ -16,7 +17,9 @@ rustPlatform.buildRustPackage rec {
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
nativeBuildInputs = [ pkg-config makeWrapper cmake ];
buildInputs = lib.optional stdenv.isDarwin Security;
buildInputs = lib.optionals stdenv.isDarwin
[ libiconv CoreServices Security ];
postInstall = let
wrap = exe: ''
wrapProgram $out/bin/${exe} \