ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

elvish: 0.9 -> 0.10; fix darwin build (#29587)

Browse Source 
* 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
This commit is contained in:
Diego Zamboni 2017-09-21 13:20:37 +02:00 committed by Jörg Thalheim
parent 595d92eb7a
commit 8b8a2fd542
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/shells/elvish/default.nix
View File

@ -2,7 +2,11 @@
buildGoPackage rec { buildGoPackage rec {
name = "elvish-${version}"; 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"; goPackagePath = "github.com/elves/elvish";
@ -10,7 +14,7 @@ buildGoPackage rec {
repo = "elvish"; repo = "elvish";
owner = "elves"; owner = "elves";
rev = version; rev = version;
sha256 = "0alsv04iihrk1nffp6fmyzxid26dqhg1k45957c2ymyzyq9cglxj"; sha256 = "0v6byd81nz0fbd3sdlippi1jn1z3gbqc2shnr7akd1n6k9259vrj";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -18,6 +22,6 @@ buildGoPackage rec {
homepage = https://github.com/elves/elvish; homepage = https://github.com/elves/elvish;
license = licenses.bsd2; license = licenses.bsd2;
maintainers = with maintainers; [ vrthra ]; maintainers = with maintainers; [ vrthra ];
platforms = with platforms; linux; platforms = with platforms; linux ++ darwin;
}; };
} }