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

rage: fix macOS build (#106051)

Browse Source 
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 <dmitry.kalinkin@gmail.com>
This commit is contained in:
Marin 2020-12-06 18:26:39 +03:00 committed by GitHub
parent 6c94fd93bc
commit 3d629ef723
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/security/rage/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, darwin }: { stdenv, rustPlatform, fetchFromGitHub, installShellFiles
, Foundation, Security }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rage"; pname = "rage";
@ -15,7 +16,10 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [
Foundation
Security
];
postBuild = '' postBuild = ''
cargo run --example generate-docs cargo run --example generate-docs

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

@ -3547,7 +3547,9 @@ in
pax = callPackage ../tools/archivers/pax { }; 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 { }; rar2fs = callPackage ../tools/filesystems/rar2fs { };