alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

vagrant: use bin/iconv from glibc on Linux

Browse source 
This fixes build after #4419.
This commit is contained in:
Vladimír Čunát 2014-11-03 12:19:59 +01:00
parent 0ff8281b12
commit 5b00625aa4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/tools/vagrant/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, rubyLibs, libiconv { stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, rubyLibs, libiconvOrLibc
, libxml2, libxslt }: , libxml2, libxslt }:
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
# libiconv: iconv # libiconv: iconv
rm opt/vagrant/embedded/bin/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 # libxml: xml2-config, xmlcatalog, xmllint
rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint}