From 2de35cf8eecbd52f3fa217b341172994d0e2b731 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 21 Jul 2019 02:13:17 +0200 Subject: [PATCH] evcxr: fix darwin build It seems as the `Security` framework is missing during the linking in a darwin build environment: https://logs.nix.ci/?key=nixos/nixpkgs.60675&attempt_id=42d9c159-f1a2-4abc-ab14-9dea23d941b1 --- pkgs/development/interpreters/evcxr/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index c5099a67a1d..2c30c0ca385 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -1,4 +1,4 @@ -{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc }: +{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc, Security }: rustPlatform.buildRustPackage rec { name = "evcxr-${version}"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./cargo-lock.patch ]; nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ cargo ]; + buildInputs = [ cargo ] ++ stdenv.lib.optional stdenv.isDarwin Security; postInstall = '' wrapProgram $out/bin/evcxr --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} rm $out/bin/testing_runtime diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3ee9ec71f6..d934b07b5b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8031,7 +8031,9 @@ in duktape = callPackage ../development/interpreters/duktape { }; - evcxr = callPackage ../development/interpreters/evcxr { }; + evcxr = callPackage ../development/interpreters/evcxr { + inherit (darwin.apple_sdk.frameworks) Security; + }; beam = callPackage ./beam-packages.nix { };