diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-05-16 20:10:39 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-16 10:10:39 +0000 |
| commit | 3871cee01c75510dce7152f7c1e55de80471e63f (patch) | |
| tree | 2ac3116079d4c54c20a64300620e17416b999db6 /pkgs/tools/misc | |
| parent | d028c74c3c07a9108379d123644b6b8ef5847075 (diff) | |
| download | nixlib-3871cee01c75510dce7152f7c1e55de80471e63f.tar nixlib-3871cee01c75510dce7152f7c1e55de80471e63f.tar.gz nixlib-3871cee01c75510dce7152f7c1e55de80471e63f.tar.bz2 nixlib-3871cee01c75510dce7152f7c1e55de80471e63f.tar.lz nixlib-3871cee01c75510dce7152f7c1e55de80471e63f.tar.xz nixlib-3871cee01c75510dce7152f7c1e55de80471e63f.tar.zst nixlib-3871cee01c75510dce7152f7c1e55de80471e63f.zip | |
direnv: switch to buildGoModule (#87932)
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/direnv/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index e261b95fde5a..1b6b87984c6f 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, bash }: +{ stdenv, fetchFromGitHub, buildGoModule, bash }: -buildGoPackage rec { +buildGoModule rec { pname = "direnv"; version = "2.21.3"; - goPackagePath = "github.com/direnv/direnv"; + + vendorSha256 = null; src = fetchFromGitHub { owner = "direnv"; @@ -12,17 +13,12 @@ buildGoPackage rec { sha256 = "1adi6ld9g4zgz0f6q0kkzrywclqrmikyp7yh22zm9lfdvd5hs8wp"; }; - postConfigure = '' - cd $NIX_BUILD_TOP/go/src/$goPackagePath - ''; - # we have no bash at the moment for windows makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isWindows) [ "BASH_PATH=${bash}/bin/bash" ]; installPhase = '' - mkdir -p $out 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 |