public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging'

Browse Source 
Darwin and haskell fixes.
This commit is contained in:
Shea Levy
2015-02-17 13:52:37 -05:00
parent 6be3ffb0d4 ef6b18c0ec
commit 2f061ff16b
42 changed files with 130 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/vagrant/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconvOrLibc
{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv
, libxml2, libxslt }:
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
# libiconv: iconv
rm opt/vagrant/embedded/bin/iconv
ln -s ${libiconvOrLibc}/bin/iconv opt/vagrant/embedded/bin
ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin
# libxml: xml2-config, xmlcatalog, xmllint
rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint}