diff options
author | Diego Zamboni <diego@zzamboni.org> | 2017-09-21 13:20:37 +0200 |
---|---|---|
committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-09-21 12:20:37 +0100 |
commit | 8b8a2fd5424ed60980ce6c1dd51d0bb8fdfb5cf3 (patch) | |
tree | 8b717c54142f3ae1052996a93cb167eda25525db /pkgs/shells/elvish/default.nix | |
parent | 595d92eb7a1fee050e52a5ad043a45cea887026c (diff) | |
download | nixlib-8b8a2fd5424ed60980ce6c1dd51d0bb8fdfb5cf3.tar nixlib-8b8a2fd5424ed60980ce6c1dd51d0bb8fdfb5cf3.tar.gz nixlib-8b8a2fd5424ed60980ce6c1dd51d0bb8fdfb5cf3.tar.bz2 nixlib-8b8a2fd5424ed60980ce6c1dd51d0bb8fdfb5cf3.tar.lz nixlib-8b8a2fd5424ed60980ce6c1dd51d0bb8fdfb5cf3.tar.xz nixlib-8b8a2fd5424ed60980ce6c1dd51d0bb8fdfb5cf3.tar.zst nixlib-8b8a2fd5424ed60980ce6c1dd51d0bb8fdfb5cf3.zip |
elvish: 0.9 -> 0.10; fix darwin build (#29587)
* First attempt at making elvish compile on darwin * Fixed cyclic dependency on darwin This fixes the "cycle detected in the references of" error when building on darwin. The fix is based on the solution in issue #18131. * Use version 0.10 and not 0.10.1, which is not officially released yet
Diffstat (limited to 'pkgs/shells/elvish/default.nix')
-rw-r--r-- | pkgs/shells/elvish/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 1d1dddd0c2a0..8a7d49710125 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -2,7 +2,11 @@ buildGoPackage rec { name = "elvish-${version}"; - version = "0.9"; + version = "0.10"; + + postInstall = stdenv.lib.optionalString (stdenv.isDarwin) '' + install_name_tool -delete_rpath $out/lib $bin/bin/elvish + ''; goPackagePath = "github.com/elves/elvish"; @@ -10,7 +14,7 @@ buildGoPackage rec { repo = "elvish"; owner = "elves"; rev = version; - sha256 = "0alsv04iihrk1nffp6fmyzxid26dqhg1k45957c2ymyzyq9cglxj"; + sha256 = "0v6byd81nz0fbd3sdlippi1jn1z3gbqc2shnr7akd1n6k9259vrj"; }; meta = with stdenv.lib; { @@ -18,6 +22,6 @@ buildGoPackage rec { homepage = https://github.com/elves/elvish; license = licenses.bsd2; maintainers = with maintainers; [ vrthra ]; - platforms = with platforms; linux; + platforms = with platforms; linux ++ darwin; }; } |