about summary refs log tree commit diff
path: root/pkgs/applications/version-management/gitlab/gitlab-shell
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2019-07-16 03:48:33 +0200
committerRobin Gloster <mail@glob.in>2019-07-16 03:51:22 +0200
commita33ddd7a68d222d1096d390df39068651cc13c79 (patch)
treed6f6e1fb4a9f773e7a54bc96f598e7bdd9af867f /pkgs/applications/version-management/gitlab/gitlab-shell
parent52fd300b8cce730e50a8afd9dd3de655df1c8af6 (diff)
downloadnixlib-a33ddd7a68d222d1096d390df39068651cc13c79.tar
nixlib-a33ddd7a68d222d1096d390df39068651cc13c79.tar.gz
nixlib-a33ddd7a68d222d1096d390df39068651cc13c79.tar.bz2
nixlib-a33ddd7a68d222d1096d390df39068651cc13c79.tar.lz
nixlib-a33ddd7a68d222d1096d390df39068651cc13c79.tar.xz
nixlib-a33ddd7a68d222d1096d390df39068651cc13c79.tar.zst
nixlib-a33ddd7a68d222d1096d390df39068651cc13c79.zip
gitlab-shell: fix fallback bin searching
Diffstat (limited to 'pkgs/applications/version-management/gitlab/gitlab-shell')
-rw-r--r--pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
index 9b5efeaee801..d8337ebb9ea4 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
@@ -56,3 +56,16 @@ index 2cb76a8..f59ad5e 100644
    end
  
    def api
+diff --git a/go/internal/command/fallback/fallback.go b/go/internal/command/fallback/fallback.go
+index 2cb76a8..f59ad5e 100644
+--- a/go/internal/command/fallback/fallback.go
++++ b/go/internal/command/fallback/fallback.go
+@@ -21,7 +21,7 @@
+ )
+ 
+ func (c *Command) Execute() error {
+-	rubyCmd := filepath.Join(c.RootDir, "bin", RubyProgram)
++	rubyCmd := filepath.Join("/run/current-system/sw/bin", RubyProgram)
+ 
+ 	// Ensure rubyArgs[0] is the full path to gitlab-shell-ruby
+ 	rubyArgs := append([]string{rubyCmd}, c.Args[1:]...)