From 23c2fca53a4bc7f7160384bb7893697e06377b39 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Thu, 6 Sep 2018 16:49:50 -0700 Subject: [PATCH] gx: fix build for unrewrite And add a dummy package that refuses to build unless we're using gx. fixes #4831 License: MIT Signed-off-by: Steven Allen --- cmd/ipfs/ipfs.go | 1 + mk/gx.mk | 1 + package.json | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index 12093fb31a3..30035fd2407 100644 --- a/cmd/ipfs/ipfs.go +++ b/cmd/ipfs/ipfs.go @@ -5,6 +5,7 @@ import ( commands "github.com/ipfs/go-ipfs/core/commands" + _ "github.com/gxed/go-require-gx" cmds "github.com/ipfs/go-ipfs-cmds" ) diff --git a/mk/gx.mk b/mk/gx.mk index 8f1744f2684..302fa8d9af5 100644 --- a/mk/gx.mk +++ b/mk/gx.mk @@ -2,6 +2,7 @@ gx-path = gx/ipfs/$(shell gx deps find $(1))/$(1) gx-deps: gx install --global + gx-go rw .PHONY: gx-deps ifneq ($(IPFS_GX_USE_GLOBAL),1) diff --git a/package.json b/package.json index 1e004aff8e3..4bc35a863a1 100644 --- a/package.json +++ b/package.json @@ -580,6 +580,12 @@ "hash": "QmZMWMvWMVKCbHetJ4RgndbuEF1io2UpUxwQwtNjtYPzSC", "name": "go-ipfs-files", "version": "1.0.1" + }, + { + "author": "stebalien", + "hash": "QmQKUCtsLJJHvqejxsDM3Nk3VqFFCg7JR7gPmnL2GW6RHs", + "name": "go-require-gx", + "version": "1.0.0" } ], "gxVersion": "0.10.0",