diff --git a/flake.lock b/flake.lock index 5e059e8..5e0f92b 100644 --- a/flake.lock +++ b/flake.lock @@ -55,16 +55,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728740863, - "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", + "lastModified": 1733550349, + "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", + "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -93,6 +93,7 @@ }, "original": { "owner": "snowfallorg", + "ref": "c6238c83de101729c5de3a29586ba166a9a65622", "repo": "lib", "type": "github" } diff --git a/flake.nix b/flake.nix index 6e81666..dff30ce 100644 --- a/flake.nix +++ b/flake.nix @@ -5,10 +5,10 @@ }; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; snowfall-lib = { - url = "github:snowfallorg/lib"; + url = "github:snowfallorg/lib?ref=c6238c83de101729c5de3a29586ba166a9a65622"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/packages/gramine/default.nix b/packages/gramine/default.nix index 9fcb433..33a91cc 100644 --- a/packages/gramine/default.nix +++ b/packages/gramine/default.nix @@ -15,7 +15,9 @@ , gawk , bison , patchelf +, protobufc , which +, python3Packages }: let python = pkgs.python3; @@ -96,7 +98,7 @@ python.pkgs.buildPythonPackage { cmake pkg-config nixsgx.sgx-sdk - nixsgx.protobufc + protobufc nixsgx.sgx-dcap.dev nixsgx.sgx-dcap.quote_verify autoconf @@ -107,9 +109,15 @@ python.pkgs.buildPythonPackage { perl ]; + + build-system = with python3Packages; [ + setuptools + distutils + ]; + 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 ]; - }; -}