diff options
author | zimbatm <zimbatm@zimbatm.com> | 2017-08-14 15:23:34 +0100 |
---|---|---|
committer | zimbatm <zimbatm@zimbatm.com> | 2017-08-14 15:23:47 +0100 |
commit | aa60296df6d6345e527b550779fa9317b877e149 (patch) | |
tree | 9ab53ee4dc5879136c1070340811d534b71a6d22 /pkgs/tools/misc | |
parent | 16f69139f76624545914695b3d447971704877a1 (diff) | |
download | nixpkgs-aa60296df6d6345e527b550779fa9317b877e149.tar nixpkgs-aa60296df6d6345e527b550779fa9317b877e149.tar.gz nixpkgs-aa60296df6d6345e527b550779fa9317b877e149.tar.bz2 nixpkgs-aa60296df6d6345e527b550779fa9317b877e149.tar.lz nixpkgs-aa60296df6d6345e527b550779fa9317b877e149.tar.xz nixpkgs-aa60296df6d6345e527b550779fa9317b877e149.tar.zst nixpkgs-aa60296df6d6345e527b550779fa9317b877e149.zip |
direnv: 2.10.0 -> 2.12.2
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/direnv/default.nix | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 346ee797637..1606fffe397 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,26 +1,32 @@ -{ stdenv, fetchFromGitHub, go, bash, writeText}: +{ stdenv, fetchFromGitHub, buildGoPackage, bash, writeText}: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "direnv-${version}"; - version = "2.10.0"; + version = "2.12.2"; + goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "04b098i8dlr6frks67ik0kbc281c6j8lkb6v0y33iwqv45n233q3"; + sha256 = "0i8fnxhcl1zin714wxk93x8fi36z4fibapfn4jl3qkwbczkj8c8b"; }; - buildInputs = [ go ]; + postConfigure = '' + cd $NIX_BUILD_TOP/go/src/$goPackagePath + ''; buildPhase = '' make BASH_PATH=${bash}/bin/bash ''; installPhase = '' - make install DESTDIR=$out - mkdir -p $out/share/fish/vendor_conf.d - echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish + mkdir -p $out + make install DESTDIR=$bin + mkdir -p $bin/share/fish/vendor_conf.d + echo "eval ($bin/bin/direnv hook fish)" > $bin/share/fish/vendor_conf.d/direnv.fish + '' + stdenv.lib.optionalString (stdenv.isDarwin) '' + install_name_tool -delete_rpath $out/lib $bin/bin/direnv ''; meta = with stdenv.lib; { @@ -39,6 +45,5 @@ stdenv.mkDerivation rec { homepage = http://direnv.net; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; - inherit (go.meta) platforms; }; } |