diff options
| author | Charles Strahan <charles@cstrahan.com> | 2017-07-11 17:59:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-11 17:59:51 -0400 |
| commit | 47868cbfb8659c16736e2cfbeb5bc67d6aceccf1 (patch) | |
| tree | c2975bead1aad9a60165a7a0e184a74c738e0e08 /pkgs/servers | |
| parent | 1d7aefd585ace3749b9f381ad030644171c97ff9 (diff) | |
| parent | bc7c311c4d0cedfe76883f6923cfbb828500485e (diff) | |
| download | nixlib-47868cbfb8659c16736e2cfbeb5bc67d6aceccf1.tar nixlib-47868cbfb8659c16736e2cfbeb5bc67d6aceccf1.tar.gz nixlib-47868cbfb8659c16736e2cfbeb5bc67d6aceccf1.tar.bz2 nixlib-47868cbfb8659c16736e2cfbeb5bc67d6aceccf1.tar.lz nixlib-47868cbfb8659c16736e2cfbeb5bc67d6aceccf1.tar.xz nixlib-47868cbfb8659c16736e2cfbeb5bc67d6aceccf1.tar.zst nixlib-47868cbfb8659c16736e2cfbeb5bc67d6aceccf1.zip | |
Merge pull request #26127 from gabesoft/upstream-master
Fixed meteor Future is not defined error
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/meteor/main.patch | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/servers/meteor/main.patch b/pkgs/servers/meteor/main.patch index b5834bf62922..4c21a29a05c4 100644 --- a/pkgs/servers/meteor/main.patch +++ b/pkgs/servers/meteor/main.patch @@ -2,7 +2,7 @@ diff --git a/tools/cli/main.js b/tools/cli/main.js index 84f94bc..4fbda17 100644 --- a/tools/cli/main.js +++ b/tools/cli/main.js -@@ -484,6 +484,44 @@ var springboard = function (rel, options) { +@@ -484,6 +484,45 @@ var springboard = function (rel, options) { process.exit(ret.wait()); } @@ -10,6 +10,7 @@ index 84f94bc..4fbda17 100644 + // patch shebang: + var fs = require('fs'); + var path = require("path") ++ var Future = require("fibers/future") + var srcOld = fs.readFileSync(executable, 'utf8'); + srcNew = srcOld.replace(/^#!\/bin\/bash/, '#!/bin/sh'); + if (srcOld !== srcNew) { |