commit 2ab474b4a7136e9a0bb4dcee389a6adac73ce6d8 · pyrox.dev/nixpkgs

+13

pkgs/development/tools/continuous-integration/gitlab-runner/v1-fix-shell-path.patch

···

       1
       +
       diff --git a/shells/bash.go b/shells/bash.go

     

       2
       +
       index c9c8b68..c97dbb5 100644

     

       3
       +
       --- a/shells/bash.go

     

       4
       +
       +++ b/shells/bash.go

     

       5
       +
       @@ -208,7 +208,7 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo

     

       6
       +
        	if info.User != "" {

     

       7
       +
        		script.Command = "su"

     

       8
       +
        		if runtime.GOOS == "linux" {

     

       9
       +
       -			script.Arguments = append(script.Arguments, "-s", "/bin/"+b.Shell)

     

       10
       +
       +			script.Arguments = append(script.Arguments, "-s", "/run/current-system/sw/bin/"+b.Shell)

     

       11
       +
        		}

     

       12
       +
        		script.Arguments = append(script.Arguments, info.User)

     

       13
       +
        		script.Arguments = append(script.Arguments, "-c", shellCommand)

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

···

       32
        
           sha256 = "1sjvlb5981ykc8hr4kp1ibh9jw2wdjjp9zs2nqs9lpsav4nda5fr";

     

       33
        
         };

     

       34
        
       

     

       0
        
       
     

       0
        
       
     

       35
        
         buildInputs = [ go-bindata ];

     

       36
        
       

     

       37
        
         preBuild = ''

···

       32
        
           sha256 = "1sjvlb5981ykc8hr4kp1ibh9jw2wdjjp9zs2nqs9lpsav4nda5fr";

     

       33
        
         };

     

       34
        
       

     

       35
       +
         patches = [ ./v1-fix-shell-path.patch ];

     

       36
       +
       

     

       37
        
         buildInputs = [ go-bindata ];

     

       38
        
       

     

       39
        
         preBuild = ''