Unverified Commit d0c7a8f1 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #244241 from marsam/update-rbw

rbw: 1.7.1 -> 1.8.1
parents 22bcc32f c75eb703
Loading
Loading
Loading
Loading
+8 −5
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
, openssl
, pkg-config
, installShellFiles
, Security
, darwin

  # rbw-fzf
, withFzf ? false
@@ -24,20 +24,23 @@

rustPlatform.buildRustPackage rec {
  pname = "rbw";
  version = "1.7.1";
  version = "1.8.1";

  src = fetchzip {
    url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz";
    sha256 = "sha256-xE3T3iVXFaaTF90ehQiG6+dLXcsqrHeprSMUnlSsxkE=";
    sha256 = "sha256-cRfCsuhVlTRSgndf4rZrfLG/+NgI4VshVwbQydJt2cE=";
  };

  cargoHash = "sha256-eaG56FGz4smlqDPi/CJ0KB7NMEgp684X19PVWxGQutw=";
  cargoHash = "sha256-CFhBSRqWAJJJkeMNnLwp6/pLhIZHFvdlPn7pjfJFBWw=";

  nativeBuildInputs = [
    installShellFiles
  ] ++ lib.optionals stdenv.isLinux [ pkg-config ];

  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
  buildInputs = lib.optionals stdenv.isDarwin [
    darwin.apple_sdk.frameworks.Security
    darwin.apple_sdk.frameworks.AppKit
  ];

  preConfigure = lib.optionalString stdenv.isLinux ''
    export OPENSSL_INCLUDE_DIR="${openssl.dev}/include"
+1 −3
Original line number Diff line number Diff line
@@ -11947,9 +11947,7 @@ with pkgs;
  revolt-desktop = callPackage ../applications/networking/instant-messengers/revolt-desktop { };
  rbw = callPackage ../tools/security/rbw {
    inherit (darwin.apple_sdk.frameworks) Security;
  };
  rbw = callPackage ../tools/security/rbw { };
  remarshal = with python3Packages; toPythonApplication remarshal;