mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-15 17:25:11 +00:00
3894ec0a50
all: update from 4.6.0 to 4.7.2 keybase: - added gnupg as a dependency and patch fix-patch-keybase.patch kbfs: - added fuse as a dependency and patch fix-patch-kbfs.patch
17 lines
469 B
Diff
17 lines
469 B
Diff
diff --git a/go/libkb/gpg_cli.go b/go/libkb/gpg_cli.go
|
|
index 3c7c6257..ae8f7e2f 100644
|
|
--- a/go/libkb/gpg_cli.go
|
|
+++ b/go/libkb/gpg_cli.go
|
|
@@ -54,9 +54,9 @@ func (g *GpgCLI) Configure(mctx MetaContext) (err error) {
|
|
if len(prog) > 0 {
|
|
err = canExec(prog)
|
|
} else {
|
|
- prog, err = exec.LookPath("gpg2")
|
|
+ prog, err = exec.LookPath("@gpg2@")
|
|
if err != nil {
|
|
- prog, err = exec.LookPath("gpg")
|
|
+ prog, err = exec.LookPath("@gpg@")
|
|
}
|
|
}
|
|
if err != nil {
|