diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-03 12:19:59 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-03 12:58:54 +0100 |
| commit | 5b00625aa434205774d3e1cd43852ca1cbffc046 (patch) | |
| tree | a30b8a83848d17ab51071933cdf8da8cceed5fb8 | |
| parent | 0ff8281b12954f90a0095ffef0da79e3c5f8351d (diff) | |
| download | nixlib-5b00625aa434205774d3e1cd43852ca1cbffc046.tar nixlib-5b00625aa434205774d3e1cd43852ca1cbffc046.tar.gz nixlib-5b00625aa434205774d3e1cd43852ca1cbffc046.tar.bz2 nixlib-5b00625aa434205774d3e1cd43852ca1cbffc046.tar.lz nixlib-5b00625aa434205774d3e1cd43852ca1cbffc046.tar.xz nixlib-5b00625aa434205774d3e1cd43852ca1cbffc046.tar.zst nixlib-5b00625aa434205774d3e1cd43852ca1cbffc046.zip | |
vagrant: use bin/iconv from glibc on Linux
This fixes build after #4419.
| -rw-r--r-- | pkgs/development/tools/vagrant/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index bd9ccf4947ba..5e15ef64cb2f 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, rubyLibs, libiconv +{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, rubyLibs, libiconvOrLibc , libxml2, libxslt }: assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { # libiconv: iconv rm opt/vagrant/embedded/bin/iconv - ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin + ln -s ${libiconvOrLibc}/bin/iconv opt/vagrant/embedded/bin # libxml: xml2-config, xmlcatalog, xmllint rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} |