git.iko.soy/typeable/nixpkgs
on master help sign in
direnv: switch to buildGoModule (#87932)
commit3871cee01c75510dce7152f7c1e55de80471e63f authorzowoq <59103226+zowoq@users.noreply.github.com> dateSat 16 May 2020, 20:10 (7 years ago) parentd028c74
1 file changed+4−8
pkgs/tools/misc/direnv/default.nix+4−8
pkgs/tools/misc/direnv/default.nix+4−8
@@ -1,9 +1,10 @@
1−{ stdenv, fetchFromGitHub, buildGoPackage, bash }:
1+{ stdenv, fetchFromGitHub, buildGoModule, bash }:
22
3−buildGoPackage rec {
3+buildGoModule rec {
44 pname = "direnv";
55 version = "2.21.3";
6− goPackagePath = "github.com/direnv/direnv";
6+
7+ vendorSha256 = null;
78
89 src = fetchFromGitHub {
910 owner = "direnv";
@@ -12,17 +13,12 @@ buildGoPackage rec {
1213 sha256 = "1adi6ld9g4zgz0f6q0kkzrywclqrmikyp7yh22zm9lfdvd5hs8wp";
1314 };
1415
15− postConfigure = ''
16− cd $NIX_BUILD_TOP/go/src/$goPackagePath
17− '';
18−
1916 # we have no bash at the moment for windows
2017 makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isWindows) [
2118 "BASH_PATH=${bash}/bin/bash"
2219 ];
2320
2421 installPhase = ''
25− mkdir -p $out
2622 make install DESTDIR=$out
2723 mkdir -p $out/share/fish/vendor_conf.d
2824 echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish