Merge pull request #30094 from zzamboni/vagrant-fix-darwin

vagrant: fix Ruby and libffi libraries on Darwin

authored by Orivej Desh and committed by GitHub ebd14ee6 55f5699d

+17 -15
+17 -15
pkgs/development/tools/vagrant/default.nix
··· 85 ln -s ${openssl.bin}/bin/c_rehash opt/vagrant/embedded/bin 86 ln -s ${openssl.bin}/bin/openssl opt/vagrant/embedded/bin 87 88 # ruby: erb, gem, irb, rake, rdoc, ri, ruby 89 rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby} 90 ln -s ${ruby}/bin/erb opt/vagrant/embedded/bin ··· 101 ln -s $lib opt/vagrant/embedded/lib/''${lib##*/} 102 done 103 104 - # libiconv: iconv 105 - rm opt/vagrant/embedded/bin/iconv 106 - ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin 107 - 108 - # libxml: xml2-config, xmlcatalog, xmllint 109 - rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} 110 - ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin 111 - ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin 112 - ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin 113 - 114 - # libxslt: xslt-config, xsltproc 115 - rm opt/vagrant/embedded/bin/{xslt-config,xsltproc} 116 - ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin 117 - ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin 118 - 119 # libffi 120 ln -s ${libffi}/lib/libffi.so.6 opt/vagrant/embedded/lib/libffi.so.6 121 122 mkdir -p "$out" 123 cp -r opt "$out" 124 cp -r usr/bin "$out"
··· 85 ln -s ${openssl.bin}/bin/c_rehash opt/vagrant/embedded/bin 86 ln -s ${openssl.bin}/bin/openssl opt/vagrant/embedded/bin 87 88 + # libiconv: iconv 89 + rm opt/vagrant/embedded/bin/iconv 90 + ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin 91 + 92 + # libxml: xml2-config, xmlcatalog, xmllint 93 + rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} 94 + ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin 95 + ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin 96 + ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin 97 + 98 + # libxslt: xslt-config, xsltproc 99 + rm opt/vagrant/embedded/bin/{xslt-config,xsltproc} 100 + ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin 101 + ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin 102 + 103 + '' + (stdenv.lib.optionalString (! stdenv.isDarwin) '' 104 # ruby: erb, gem, irb, rake, rdoc, ri, ruby 105 rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby} 106 ln -s ${ruby}/bin/erb opt/vagrant/embedded/bin ··· 117 ln -s $lib opt/vagrant/embedded/lib/''${lib##*/} 118 done 119 120 # libffi 121 ln -s ${libffi}/lib/libffi.so.6 opt/vagrant/embedded/lib/libffi.so.6 122 123 + '') + '' 124 mkdir -p "$out" 125 cp -r opt "$out" 126 cp -r usr/bin "$out"