From 775e849b0c8796ab43e8ecaebecc99acdc2b7cc8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jun 2021 22:28:34 +0000 Subject: [PATCH 1/2] gpg-tui: 0.6.1 -> 0.6.2 --- pkgs/tools/security/gpg-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index f329fe1013b..41cfd0b2450 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - sha256 = "sha256-ajzx54uQFNZraDwqEKG9sdlMquJnluiaCqsR+JT79jw="; + sha256 = "sha256-Iv5A+o4TNSHJeTZgZ2e0SCHclz1mGMVRJDdBAWilyT8="; }; - cargoSha256 = "sha256-UjrX+Z8slMBAiKhiFjxSoX74vIiFW9bMww49oPa18ag="; + cargoSha256 = "sha256-ISG/0WtgWwZoQd8PsvaQ9L8UKwerzEhY/84DxkdZV2g="; nativeBuildInputs = [ gpgme # for gpgme-config From 64f45f1cf6f018c0eeefcf462137e1aee4e494e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 29 Jun 2021 10:53:01 +0200 Subject: [PATCH 2/2] gpg-tui: fix build on Darwin --- pkgs/tools/security/gpg-tui/default.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 41cfd0b2450..063265e51d8 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -1,10 +1,16 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , gpgme , libgpgerror , libxcb , python3 +, AppKit +, Foundation +, libiconv +, libobjc +, libresolv }: rustPlatform.buildRustPackage rec { @@ -30,6 +36,12 @@ rustPlatform.buildRustPackage rec { gpgme libgpgerror libxcb + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + Foundation + libiconv + libobjc + libresolv ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2952e8a7c8..0c7cd5508fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2786,7 +2786,10 @@ in Accelerate CoreGraphics CoreVideo; }; - gpg-tui = callPackage ../tools/security/gpg-tui { }; + gpg-tui = callPackage ../tools/security/gpg-tui { + inherit (darwin.apple_sdk.frameworks) AppKit Foundation; + inherit (darwin) libobjc libresolv; + }; goa = callPackage ../development/tools/goa { };