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

fix library dependencies for cargo on darwin

Browse Source
This commit is contained in:
Jude Taylor 2016-02-23 12:59:51 -08:00
parent beea8537f7
commit 45ea4956d8
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/tools/build-managers/cargo/common.nix
View File

@ -12,7 +12,8 @@
"$out/lib/rustlib/uninstall.sh" \ "$out/lib/rustlib/uninstall.sh" \
"$out/lib/rustlib/manifest-cargo" "$out/lib/rustlib/manifest-cargo"
wrapProgram "$out/bin/cargo" --suffix PATH : "${rustc}/bin" wrapProgram "$out/bin/cargo" --suffix PATH : "${rustc}/bin" \
${stdenv.lib.optionalString stdenv.isDarwin ''--suffix DYLD_LIBRARY_PATH : "${rustc}/lib"''}
''; '';
platform = if stdenv.system == "i686-linux" platform = if stdenv.system == "i686-linux"

10
pkgs/development/tools/build-managers/cargo/snapshot.nix
View File

@ -34,6 +34,16 @@ stdenv.mkDerivation {
dontStrip = true; dontStrip = true;
__propagatedImpureHostDeps = [
"/usr/lib/libiconv.2.dylib"
"/usr/lib/libssl.0.9.8.dylib"
"/usr/lib/libcurl.4.dylib"
"/System/Library/Frameworks/GSS.framework/GSS"
"/System/Library/Frameworks/GSS.framework/Versions/Current"
"/System/Library/PrivateFrameworks/Heimdal.framework/Heimdal"
"/System/Library/PrivateFrameworks/Heimdal.framework/Versions/Current"
];
installPhase = '' installPhase = ''
mkdir -p "$out" mkdir -p "$out"
./install.sh "--prefix=$out" ./install.sh "--prefix=$out"