From 5b00625aa434205774d3e1cd43852ca1cbffc046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 3 Nov 2014 12:19:59 +0100 Subject: [PATCH] vagrant: use bin/iconv from glibc on Linux This fixes build after #4419. --- pkgs/development/tools/vagrant/default.nix | 4 ++-- 1 file 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}