From 7494175f4d57d39d446024f8fff04dbf9dbafbc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 11 Dec 2018 17:56:50 +0000 Subject: [PATCH] curl_unix_socket: use buildGoPackage --- .../networking/curl-unix-socket/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix index d145e1e12c3a..e6f2dec30e6a 100644 --- a/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/pkgs/tools/networking/curl-unix-socket/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchFromGitHub, go }: +{ buildGoPackage, stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "curl-unix-socket-2014-09-01"; +buildGoPackage rec { + name = "curl-unix-socket-2015-04-10"; src = fetchFromGitHub { owner = "Soulou"; repo = "curl-unix-socket"; - rev = "e926dca77ba7d4a1eeae073918fdd3db92f1a350"; + rev = "a7da90b01ed43e8c0d606f760c9da82f8e3ed307"; sha256 = "1ynrrav90y3dhk8jq2fxm3jswj5nvrffwslgykj429hk6n0czb3d"; }; - buildInputs = [ go ]; - buildPhase = "go build -o curl-unix-socket"; - installPhase = "install -D curl-unix-socket $out/bin/curl-unix-socket"; + goPackagePath = "github.com/Soulou/curl-unix-socket"; + + buildPhase = '' + runHook preBuild + ( + cd go/src/${goPackagePath} + go build -o $NIX_BUILD_TOP/go/bin/curl-unix-socket + ) + runHook postBuild + ''; meta = with stdenv.lib; { description = "Run HTTP requests over UNIX socket";