diff options
| author | John Boehr <john@johnboehr.is> | 2018-05-30 10:40:18 -0700 |
|---|---|---|
| committer | John Boehr <john@johnboehr.is> | 2018-05-30 10:40:18 -0700 |
| commit | 711f96ee1df662ae04a237eddf5fd9f572e4a730 (patch) | |
| tree | da04bd789bba0599c25b3e535ffe30063e66f82b /pkgs/servers/consul/ui.nix | |
| parent | eee16f8ecc977f1848b77964720790b50f3fca55 (diff) | |
consul-ui: fix build
Update the dependencies used for building consul-ui. therubyracer is no longer required and fails to build. Instead, a nodejs binary is required to build the assets. Patch out unnecessary executions of `bundle` which can cause failures.
Diffstat (limited to 'pkgs/servers/consul/ui.nix')
| -rw-r--r-- | pkgs/servers/consul/ui.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix index b4cbca22c30a8..da9b518bad734 100644 --- a/pkgs/servers/consul/ui.nix +++ b/pkgs/servers/consul/ui.nix @@ -1,4 +1,4 @@ -{ stdenv, consul, ruby, bundlerEnv, zip }: +{ stdenv, consul, ruby, bundlerEnv, zip, nodejs }: let # `sass` et al @@ -13,9 +13,11 @@ stdenv.mkDerivation { src = consul.src; - buildInputs = [ ruby gems zip ]; + buildInputs = [ ruby gems zip nodejs ]; - patchPhase = "patchShebangs ./ui/scripts/dist.sh"; + patches = [ ./ui-no-bundle-exec.patch ]; + + postPatch = "patchShebangs ./ui/scripts/dist.sh"; buildPhase = '' # Build ui static files |