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

Merge pull request #36179 from vbgl/exa-darwin

Browse Source 
exa: fix build on darwin
This commit is contained in:
Jörg Thalheim 2018-03-01 17:39:21 +00:00 committed by GitHub
commit d482caf1bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/misc/exa/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib }:
{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib
, darwin, libiconv
}:
with rustPlatform;
@ -16,7 +18,10 @@ buildRustPackage rec {
};
nativeBuildInputs = [ cmake pkgconfig perl ];
buildInputs = [ zlib ];
buildInputs = [ zlib ]
++ stdenv.lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.Security ]
;
# Some tests fail, but Travis ensures a proper build
doCheck = false;