diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-01 17:39:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-01 17:39:21 +0000 |
| commit | d482caf1bf33ccb394feb2e360646f3c065edd47 (patch) | |
| tree | 65854e1616e69ac9f05a443d1c686f02d9963f7a | |
| parent | 8d3aa2f2b9e9ce8bb3e24468023af298fd72cdbb (diff) | |
| parent | 1aae247be178dcc27c607e1d3fb6097e0009bc6c (diff) | |
| download | nixlib-d482caf1bf33ccb394feb2e360646f3c065edd47.tar nixlib-d482caf1bf33ccb394feb2e360646f3c065edd47.tar.gz nixlib-d482caf1bf33ccb394feb2e360646f3c065edd47.tar.bz2 nixlib-d482caf1bf33ccb394feb2e360646f3c065edd47.tar.lz nixlib-d482caf1bf33ccb394feb2e360646f3c065edd47.tar.xz nixlib-d482caf1bf33ccb394feb2e360646f3c065edd47.tar.zst nixlib-d482caf1bf33ccb394feb2e360646f3c065edd47.zip | |
Merge pull request #36179 from vbgl/exa-darwin
exa: fix build on darwin
| -rw-r--r-- | pkgs/tools/misc/exa/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 503f0df331cf..c07420821ed4 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -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; |