diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-29 08:12:56 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-29 08:12:56 +0100 |
| commit | 9db2421d1f65beb38911e8133349193db0042a1d (patch) | |
| tree | 90a2f4a56cf871c74aad86138d85e9631c2c2f86 /pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch | |
| parent | 9caab8ff4a1ad36fbc0ab866f1b0f7c15d35ba90 (diff) | |
| parent | 8d88e4f6c7b09fe811d92b346e5eafefe07a47c9 (diff) | |
| download | nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.gz nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.bz2 nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.lz nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.xz nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.zst nixlib-9db2421d1f65beb38911e8133349193db0042a1d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch b/pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch new file mode 100644 index 000000000000..d8313ecb433a --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch @@ -0,0 +1,12 @@ +diff --git a/internal/git/command.go b/internal/git/command.go +index 0e5496c..5778294 100644 +--- a/internal/git/command.go ++++ b/internal/git/command.go +@@ -19,6 +19,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd { + cmd.Env = []string{ + fmt.Sprintf("HOME=%s", os.Getenv("HOME")), + fmt.Sprintf("PATH=%s", os.Getenv("PATH")), ++ fmt.Sprintf("GITLAB_SHELL_CONFIG_PATH=%s", os.Getenv("GITLAB_SHELL_CONFIG_PATH")), + fmt.Sprintf("LD_LIBRARY_PATH=%s", os.Getenv("LD_LIBRARY_PATH")), + fmt.Sprintf("GL_PROTOCOL=http"), + } |