diff --git a/packages/gramine/default.nix b/packages/gramine/default.nix index 9fcb433..97224a5 100644 --- a/packages/gramine/default.nix +++ b/packages/gramine/default.nix @@ -15,6 +15,7 @@ , gawk , bison , patchelf +, protobufc , which }: let @@ -96,7 +97,7 @@ python.pkgs.buildPythonPackage { cmake pkg-config nixsgx.sgx-sdk - nixsgx.protobufc + protobufc nixsgx.sgx-dcap.dev nixsgx.sgx-dcap.quote_verify autoconf @@ -108,8 +109,8 @@ python.pkgs.buildPythonPackage { ]; buildInputs = [ - nixsgx.protobufc.dev - nixsgx.protobufc.lib + protobufc.dev + protobufc.lib bash ]; diff --git a/packages/protobufc/default.nix b/packages/protobufc/default.nix deleted file mode 100644 index 94f96eb..0000000 --- a/packages/protobufc/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, autoreconfHook -, pkg-config -, protobuf -, zlib -, buildPackages -}: - -stdenv.mkDerivation rec { - pname = "protobuf-c"; - version = "1.5.0"; - - src = fetchFromGitHub { - owner = "protobuf-c"; - repo = "protobuf-c"; - rev = "refs/tags/v${version}"; - hash = "sha256-Dkpcc7ZfvAIVY91trRiHuiRFcUGUbQxbheYKTBcq80I="; - }; - - outputs = [ "out" "dev" "lib" ]; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ protobuf zlib ]; - - PROTOC = lib.getExe buildPackages.protobuf; - - meta = with lib; { - homepage = "https://github.com/protobuf-c/protobuf-c/"; - description = "C bindings for Google's Protocol Buffers"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ nickcao ]; - }; -}