Merge remote-tracking branch 'upstream/staging' into HEAD

2018-01-02 19:10:45 +01:00
parent 63c1a54257 4cc2a38854
commit 804285f589
408 changed files with 3419 additions and 2498 deletions
@@ -150,7 +150,7 @@ let
            addToSearchPath GEM_PATH \$1/${passthru.gemPath}
          }

-          envHooks+=(addGemPath)
+          addEnvHooks "$hostOffset" addGemPath
          EOF
        '' + opString useRailsExpress ''
          rbConfig=$(find $out/lib/ruby -name rbconfig.rb)