diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-10-02 18:28:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 18:28:57 +0200 |
| commit | fced3c2f1844dd836015eb5fb7f1573d3109c920 (patch) | |
| tree | 88485910d592ec7fafdf841062cf7ff1cc3eb04d /pkgs | |
| parent | 2f188ff37f9a43985e351d6a1edb570031c44518 (diff) | |
| parent | 859a4c30cf96b95949c48c5d6fda63ff5d839898 (diff) | |
| download | nixlib-fced3c2f1844dd836015eb5fb7f1573d3109c920.tar nixlib-fced3c2f1844dd836015eb5fb7f1573d3109c920.tar.gz nixlib-fced3c2f1844dd836015eb5fb7f1573d3109c920.tar.bz2 nixlib-fced3c2f1844dd836015eb5fb7f1573d3109c920.tar.lz nixlib-fced3c2f1844dd836015eb5fb7f1573d3109c920.tar.xz nixlib-fced3c2f1844dd836015eb5fb7f1573d3109c920.tar.zst nixlib-fced3c2f1844dd836015eb5fb7f1573d3109c920.zip | |
Merge pull request #29938 from pmahoney/universal-ctags-darwin
universal-ctags: include libiconv on darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/universal-ctags/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index ceff549f3736..2a77fc42602a 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }: stdenv.mkDerivation rec { name = "universal-ctags-${version}"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1kbw9ycl2ddzpfs1v4rbqa4gdhw4inrisf4awyaxb7zxfxmbzk1g"; }; - nativeBuildInputs = [ pythonPackages.docutils ]; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; autoreconfPhase = '' ./autogen.sh --tmpdir |