diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2020-03-29 14:08:10 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2020-03-29 14:08:10 +0100 |
| commit | 10059e4b71ff132a42c0a793f36e5d07a7e11311 (patch) | |
| tree | fefd66fa4622a255fbe2ff5ec14f69a3d9645d88 /pkgs/tools/security | |
| parent | e54a9c85df278e5e0840d3606af49cc6c75b3975 (diff) | |
| parent | d04396da8bf320f41a2bd939f2f4eb83a586b3b2 (diff) | |
| download | nixlib-10059e4b71ff132a42c0a793f36e5d07a7e11311.tar nixlib-10059e4b71ff132a42c0a793f36e5d07a7e11311.tar.gz nixlib-10059e4b71ff132a42c0a793f36e5d07a7e11311.tar.bz2 nixlib-10059e4b71ff132a42c0a793f36e5d07a7e11311.tar.lz nixlib-10059e4b71ff132a42c0a793f36e5d07a7e11311.tar.xz nixlib-10059e4b71ff132a42c0a793f36e5d07a7e11311.tar.zst nixlib-10059e4b71ff132a42c0a793f36e5d07a7e11311.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/ripasso/cursive.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/sequoia/default.nix | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index 70c4ee864b64..c8a55d3f397f 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -16,9 +16,9 @@ buildRustPackage rec { cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gpgme python3 ]; buildInputs = [ - ncurses python3 openssl libgpgerror gpgme xorg.libxcb + ncurses openssl libgpgerror gpgme xorg.libxcb ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; preFixup = '' diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index fe0b13bbb973..d1a24f49d802 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { llvmPackages.libclang llvmPackages.clang ensureNewerSourcesForZipFilesHook + capnproto ] ++ lib.optionals pythonSupport [ pythonPackages.setuptools ] ; @@ -41,9 +42,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite nettle - capnproto - ] - ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ] + ] ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ] ; |