From d2a94b1a9bf018d43f140bd98a2b93424761d56f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 4 Nov 2022 04:20:00 +0000 Subject: [PATCH 1/2] gurk-rs: 0.2.5 -> 0.3.0 https://github.com/boxdot/gurk-rs/releases/tag/v0.3.0 --- .../networking/instant-messengers/gurk-rs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix index e518590a9167..fd8099bb9132 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -7,20 +7,21 @@ rustPlatform.buildRustPackage rec { pname = "gurk-rs"; - version = "0.2.5"; + version = "0.3.0"; src = fetchFromGitHub { owner = "boxdot"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CEsnZ0V85eOH+bjtico5yo9kS6eMT7Dx3H6wiDUjQm4="; + sha256 = "sha256-uJvi082HkWW9y8jwHTvzuzBAi7uVtjq/4U0bO0EWdVM="; }; postPatch = '' rm .cargo/config.toml ''; - cargoHash = "sha256-z+2G/hD1zYOoJrYFB0eEP6y9MoV2OfdkJVt6je94EkU="; + cargoHash = "sha256-jS6wAswGqgfmpPV6qERhqn1IhpcBSDNh8HDdPo04F0A="; + buildInputs = [ protobuf ]; PROTOC = "${protobuf}/bin/protoc"; From 30136a9c9310001fbfeafe0d666d0de829afa9f0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 4 Nov 2022 04:20:00 +0000 Subject: [PATCH 2/2] gurk-rs: fix build on darwin --- .../networking/instant-messengers/gurk-rs/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix index fd8099bb9132..15564de27271 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -3,6 +3,7 @@ , protobuf , rustPlatform , fetchFromGitHub +, Cocoa }: rustPlatform.buildRustPackage rec { @@ -22,12 +23,15 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jS6wAswGqgfmpPV6qERhqn1IhpcBSDNh8HDdPo04F0A="; - buildInputs = [ protobuf ]; + nativeBuildInputs = [ protobuf ]; + + buildInputs = lib.optionals stdenv.isDarwin [ Cocoa ]; + + NIX_LDFLAGS = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-framework" "AppKit" ]; PROTOC = "${protobuf}/bin/protoc"; meta = with lib; { - broken = stdenv.isDarwin; description = "Signal Messenger client for terminal"; homepage = "https://github.com/boxdot/gurk-rs"; license = licenses.agpl3Only; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 940fd7e78cfe..5703283ee1d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28497,7 +28497,9 @@ with pkgs; fftw = fftwSinglePrec; }; - gurk-rs = callPackage ../applications/networking/instant-messengers/gurk-rs { }; + gurk-rs = callPackage ../applications/networking/instant-messengers/gurk-rs { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; gjay = callPackage ../applications/audio/gjay { };