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 <steven@stebalien.com>
ipfs · Oct 18, 2018 · 23c2fca · 23c2fca
1 parent 4890d59
commit 23c2fca
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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",