diff options
| author | Jude Taylor <me@jude.bio> | 2016-02-23 12:59:51 -0800 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2016-02-23 16:42:51 -0800 |
| commit | 45ea4956d8144ce3dc46617b6c982ead57fe4f96 (patch) | |
| tree | d6e45e1dcdf6e9a0f31d7e37e9d95b28b52a0136 | |
| parent | beea8537f7ebac9805cf526538f51e170353647e (diff) | |
| download | nixlib-45ea4956d8144ce3dc46617b6c982ead57fe4f96.tar nixlib-45ea4956d8144ce3dc46617b6c982ead57fe4f96.tar.gz nixlib-45ea4956d8144ce3dc46617b6c982ead57fe4f96.tar.bz2 nixlib-45ea4956d8144ce3dc46617b6c982ead57fe4f96.tar.lz nixlib-45ea4956d8144ce3dc46617b6c982ead57fe4f96.tar.xz nixlib-45ea4956d8144ce3dc46617b6c982ead57fe4f96.tar.zst nixlib-45ea4956d8144ce3dc46617b6c982ead57fe4f96.zip | |
fix library dependencies for cargo on darwin
| -rw-r--r-- | pkgs/development/tools/build-managers/cargo/common.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/cargo/snapshot.nix | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix index 941fe8073075..110956ebf85d 100644 --- a/pkgs/development/tools/build-managers/cargo/common.nix +++ b/pkgs/development/tools/build-managers/cargo/common.nix @@ -12,7 +12,8 @@ "$out/lib/rustlib/uninstall.sh" \ "$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" diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix index ad07148815bb..6dbe1e727d31 100644 --- a/pkgs/development/tools/build-managers/cargo/snapshot.nix +++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix @@ -34,6 +34,16 @@ stdenv.mkDerivation { 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 = '' mkdir -p "$out" ./install.sh "--prefix=$out" |