From b866da6826e6cc85cea9e6a59d9667890022b89c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Feb 2015 15:07:10 -0800 Subject: [PATCH] consul: Remove dependency on go-deps --- pkgs/servers/consul/default.nix | 5 +++++ pkgs/servers/consul/template.nix | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index f7e19a37304..b299981bee2 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -39,6 +39,11 @@ stdenv.mkDerivation { outputs = [ "out" "ui" ]; installPhase = '' + # Fix references to go-deps in the binary + hash=$(echo $src | sed 's,.*/\([^/-]*\).*,\1,g') + xs=$(printf 'x%.0s' $(seq 2 $(echo $hash | wc -c))) + sed -i "s,$hash,$xs,g" consul + # Install consul binary mkdir -p $out/bin cp consul $out/bin diff --git a/pkgs/servers/consul/template.nix b/pkgs/servers/consul/template.nix index 5585dc4d89e..59ca524b51e 100644 --- a/pkgs/servers/consul/template.nix +++ b/pkgs/servers/consul/template.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { ''; installPhase = '' + # Fix references to go-deps in the binary + hash=$(echo $src | sed 's,.*/\([^/-]*\).*,\1,g') + xs=$(printf 'x%.0s' $(seq 2 $(echo $hash | wc -c))) + sed -i "s,$hash,$xs,g" consul-template + mkdir -p $out/bin cp consul-template $out/bin '';