mirror of
https://git.asonix.dog/asonix/pict-rs
synced 2024-12-22 11:21:24 +00:00
Remove protobuf, no longer needed
This commit is contained in:
parent
3a0546694f
commit
14deab75d6
2 changed files with 5 additions and 7 deletions
|
@ -38,7 +38,6 @@
|
||||||
garage
|
garage
|
||||||
gcc
|
gcc
|
||||||
imagemagick
|
imagemagick
|
||||||
protobuf
|
|
||||||
rust-analyzer
|
rust-analyzer
|
||||||
rustc
|
rustc
|
||||||
rustfmt
|
rustfmt
|
||||||
|
|
11
pict-rs.nix
11
pict-rs.nix
|
@ -4,7 +4,6 @@
|
||||||
, lib
|
, lib
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, nixosTests
|
, nixosTests
|
||||||
, protobuf
|
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, Security
|
, Security
|
||||||
, stdenv
|
, stdenv
|
||||||
|
@ -12,21 +11,21 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage {
|
rustPlatform.buildRustPackage {
|
||||||
pname = "pict-rs";
|
pname = "pict-rs";
|
||||||
version = "0.5.0-alpha.20";
|
version = "0.5.0-beta.1";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
cargoLock = {
|
cargoLock = {
|
||||||
lockFile = ./Cargo.lock;
|
lockFile = ./Cargo.lock;
|
||||||
};
|
};
|
||||||
|
|
||||||
PROTOC = "${protobuf}/bin/protoc";
|
|
||||||
PROTOC_INCLUDE = "${protobuf}/include";
|
|
||||||
|
|
||||||
RUSTFLAGS = "--cfg tokio_unstable --cfg uuid_unstable";
|
RUSTFLAGS = "--cfg tokio_unstable --cfg uuid_unstable";
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ stdenv makeWrapper ];
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
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 = ''
|
postInstall = ''
|
||||||
wrapProgram $out/bin/pict-rs \
|
wrapProgram $out/bin/pict-rs \
|
||||||
--prefix PATH : "${lib.makeBinPath [ imagemagick ffmpeg_6-full exiftool ]}"
|
--prefix PATH : "${lib.makeBinPath [ imagemagick ffmpeg_6-full exiftool ]}"
|
||||||
|
|
Loading…
Reference in a new issue