From 14deab75d673bc4c9e18896227c9cdc3089cad66 Mon Sep 17 00:00:00 2001 From: asonix Date: Fri, 10 Nov 2023 18:42:21 -0600 Subject: [PATCH] Remove protobuf, no longer needed --- flake.nix | 1 - pict-rs.nix | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 0b0a384..bf2ed66 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,6 @@ garage gcc imagemagick - protobuf rust-analyzer rustc rustfmt diff --git a/pict-rs.nix b/pict-rs.nix index a6d4a5b..73e71a7 100644 --- a/pict-rs.nix +++ b/pict-rs.nix @@ -4,7 +4,6 @@ , lib , makeWrapper , nixosTests -, protobuf , rustPlatform , Security , stdenv @@ -12,21 +11,21 @@ rustPlatform.buildRustPackage { pname = "pict-rs"; - version = "0.5.0-alpha.20"; + version = "0.5.0-beta.1"; src = ./.; cargoLock = { lockFile = ./Cargo.lock; }; - PROTOC = "${protobuf}/bin/protoc"; - PROTOC_INCLUDE = "${protobuf}/include"; - RUSTFLAGS = "--cfg tokio_unstable --cfg uuid_unstable"; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ stdenv makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + TARGET_CC = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + TARGET_AR = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}ar"; + postInstall = '' wrapProgram $out/bin/pict-rs \ --prefix PATH : "${lib.makeBinPath [ imagemagick ffmpeg_6-full exiftool ]}"