From 3d629ef7231b9e477d7fafd2705675cfd5f37b8b Mon Sep 17 00:00:00 2001 From: Marin Date: Sun, 6 Dec 2020 18:26:39 +0300 Subject: rage: fix macOS build (#106051) Without the explicit Foundation dep, linker fails with this message: ``` = note: ld: framework not found Foundation clang-7: error: linker command failed with exit code 1 (use -v to see invocation) error: aborting due to previous error error: could not compile `i18n-embed-fl` ``` Co-authored-by: Dmitry Kalinkin --- pkgs/tools/security/rage/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index 1e0164e10cf4..69ea8c0f9c2c 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -1,4 +1,5 @@ -{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, darwin }: +{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles +, Foundation, Security }: rustPlatform.buildRustPackage rec { pname = "rage"; @@ -15,7 +16,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + Foundation + Security + ]; postBuild = '' cargo run --example generate-docs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 435e707b13c0..184632f49246 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3547,7 +3547,9 @@ in pax = callPackage ../tools/archivers/pax { }; - rage = callPackage ../tools/security/rage { }; + rage = callPackage ../tools/security/rage { + inherit (darwin.apple_sdk.frameworks) Foundation Security; + }; rar2fs = callPackage ../tools/filesystems/rar2fs { }; -- cgit v1.2.3