BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gitlab-runner_1_11: add patch to fetch shells from system path

Browse source
This commit is contained in:
Franz Pletz 2017-05-11 23:16:31 +02:00
parent 0cd0581b75
commit 2ab474b4a7
No known key found for this signature in database
GPG key ID: 846FDED7792617B4
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/tools/continuous-integration/gitlab-runner/v1-fix-shell-path.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/shells/bash.go b/shells/bash.go
index c9c8b68..c97dbb5 100644
--- a/shells/bash.go
+++ b/shells/bash.go
@@ -208,7 +208,7 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo
if info.User != "" {
script.Command = "su"
if runtime.GOOS == "linux" {
- script.Arguments = append(script.Arguments, "-s", "/bin/"+b.Shell)
+ script.Arguments = append(script.Arguments, "-s", "/run/current-system/sw/bin/"+b.Shell)
}
script.Arguments = append(script.Arguments, info.User)
script.Arguments = append(script.Arguments, "-c", shellCommand)

2
pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
View file

@ -32,6 +32,8 @@ buildGoPackage rec {
sha256 = "1sjvlb5981ykc8hr4kp1ibh9jw2wdjjp9zs2nqs9lpsav4nda5fr";
};
patches = [ ./v1-fix-shell-path.patch ];
buildInputs = [ go-bindata ];
preBuild = ''