vagrant: use bin/iconv from glibc on Linux · pyrox.dev/nixpkgs@5b00625

pyrox.dev / nixpkgs

fork atom

lol

fork atom

vagrant: use bin/iconv from glibc on Linux

This fixes build after #4419.

Vladimír Čunát 11 years ago 5b00625a 0ff8281b

+2 -2

1 changed file

expand all

pkgs

development

tools

vagrant

default.nix

+2 -2

pkgs/development/tools/vagrant/default.nix

··· 1 - { stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, rubyLibs, libiconv 1 + { stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, rubyLibs, libiconvOrLibc 2 2 , libxml2, libxslt }: 3 3 4 4 assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; ··· 66 66 67 67 # libiconv: iconv 68 68 rm opt/vagrant/embedded/bin/iconv 69 - ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin 69 + ln -s ${libiconvOrLibc}/bin/iconv opt/vagrant/embedded/bin 70 70 71 71 # libxml: xml2-config, xmlcatalog, xmllint 72 72 rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint}