2 files changed, 10 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index caa6e0e9e784..612018b2f57f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,7 +5,7 @@ pkgbase = grapes
 	url = https://github.com/yaronsumel/grapes
 	arch = x86_64
 	license = MIT
-	makedepends = go-pie
+	makedepends = go
 	depends = glibc
 	source = grapes-0.3.1.tar.gz::https://github.com/yaronsumel/grapes/archive/v0.3.1.tar.gz
 	sha256sums = 856e1c801df46a78bc089a089192aacce4cc8755dd83bcb95da896bdc205ac74
diff --git a/PKGBUILD b/PKGBUILD
index 1eac4370bb48..83c9faa413aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,28 +8,27 @@ arch=('x86_64')
 url='https://github.com/yaronsumel/grapes'
 license=('MIT')
 depends=('glibc')
-makedepends=('go-pie')
+makedepends=('go')
 source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
 sha256sums=('856e1c801df46a78bc089a089192aacce4cc8755dd83bcb95da896bdc205ac74')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  mkdir -p $srcdir/go
-  export GOPATH="${srcdir}"/go
-  export PATH=$PATH:$GOPATH/bin
-  go get -d -v ./...
+  mkdir -p build/
 }
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  export GOPATH="${srcdir}"/go
-  export PATH=$PATH:$GOPATH/bin
-  go build -mod=mod -v -o "${srcdir}/${pkgname}-bin"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+  go build -o build ./...
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  install -Dm755 ../${pkgname}-bin "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm755 build/grapes "${pkgdir}/usr/bin/${pkgname}"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  go clean -modcache #Remove go libraries
 }
\ No newline at end of file