From e734ce05b86974738c5e6c504b5cbf618bf709f2 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 29 Aug 2015 15:27:30 -0700 Subject: [PATCH] prometheus-pushgateway: move go-bindata into nativeBuildInputs Thereotically make life easier for a future cross-compilation path. --- .../prometheus/pushgateway/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix index 1b0fcd7485e2..5d21b53ab722 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix @@ -15,21 +15,24 @@ let self = buildGoPackage rec { }; buildInputs = [ - go-bindata.bin protobuf httprouter golang_protobuf_extensions prometheus.client_golang ]; + nativeBuildInputs = [ + go-bindata.bin + ]; + buildFlagsArray = '' -ldflags= - -X main.buildVersion ${rev} - -X main.buildRev ${rev} - -X main.buildBranch master - -X main.buildUser nix@nixpkgs - -X main.buildDate 20150101-00:00:00 - -X main.goVersion ${lib.getVersion go} + -X main.buildVersion=${rev} + -X main.buildRev=${rev} + -X main.buildBranch=master + -X main.buildUser=nix@nixpkgs + -X main.buildDate=20150101-00:00:00 + -X main.goVersion=${lib.getVersion go} ''; preBuild = ''