From c5342ed3feda6f6f427fdea65a24f1ac86b3c2cc Mon Sep 17 00:00:00 2001 From: Serge Bazanski Date: Fri, 1 Jan 2021 22:13:39 +0100 Subject: Switch to callPackage --- messages/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'messages') diff --git a/messages/default.nix b/messages/default.nix index 4b1e734..f397b1d 100644 --- a/messages/default.nix +++ b/messages/default.nix @@ -1,14 +1,22 @@ -with (import { }); let - node-protoc-precompiled = pkgs.fetchzip { +{ stdenv +, autoPatchelfHook +, fetchFromGitHub +, fetchzip +, gcc-unwrapped +, yarn2nix-moretea +, ... }: + +let + node-protoc-precompiled = fetchzip { name = "node-protoc-precompiled"; url = "https://node-precompiled-binaries.grpc.io/grpc-tools/v1.10.0/linux-x64.tar.gz"; sha256 = "0dl1anpw3610q58mxf7r9dcp768krwvpa4053cjxn5r8b5xfbh4l"; }; - node-protoc-patched = pkgs.stdenv.mkDerivation { + node-protoc-patched = stdenv.mkDerivation { name = "node-protoc"; - buildInputs = [ pkgs.gcc-unwrapped.lib ]; - nativeBuildInputs = [ pkgs.autoPatchelfHook ]; + buildInputs = [ gcc-unwrapped.lib ]; + nativeBuildInputs = [ autoPatchelfHook ]; dontAutoPatchelf = true; dontUnpack = true; # protoc: symbol lookup error: /nix/store/...-node-protoc/bin/protoc: undefined symbol: , version -- cgit v1.2.3