diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-02-14 19:05:45 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-14 19:05:45 +0100 |
| commit | 7edafc884c2a21258541b17a231051702c458263 (patch) | |
| tree | d4202c8d6516bacd32fa55ee23c54b069ef8abd6 /guix/build | |
| parent | 89da127035737bdf922bc566970c5506c2e01b00 (diff) | |
| parent | 64fc4f3705423c83c680a95d8dea81a39fce9a70 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/go-build-system.scm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/guix/build/go-build-system.scm b/guix/build/go-build-system.scm index 4bc0156a88..0d15f978cd 100644 --- a/guix/build/go-build-system.scm +++ b/guix/build/go-build-system.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016 Petter <petter@mykolab.ch> ;;; Copyright © 2017, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us> ;;; ;;; This file is part of GNU Guix. ;;; @@ -141,6 +142,10 @@ dependencies, so it should be self-contained." ;; Using the current working directory as GOPATH makes it easier for packagers ;; who need to manipulate the unpacked source code. (setenv "GOPATH" (getcwd)) + ;; Go 1.13 uses go modules by default. The go build system does not + ;; currently support modules, so turn modules off to continue using the old + ;; GOPATH behavior. + (setenv "GO111MODULE" "off") (setenv "GOBIN" (string-append (assoc-ref outputs "out") "/bin")) (let ((tmpdir (tmpnam))) (match (go-inputs inputs) |