From e957b3c5b82091898add49fd886f4c6e41538410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sat, 15 May 2021 12:37:17 +0200 Subject: [PATCH] evcxr: fix darwin build --- pkgs/development/interpreters/evcxr/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 53a83607c86..a6e995c9bcc 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -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} \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77aa79e17f9..6276db5c174 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11879,7 +11879,7 @@ in duktape = callPackage ../development/interpreters/duktape { }; evcxr = callPackage ../development/interpreters/evcxr { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; beam = callPackage ./beam-packages.nix { };