Merge pull request #81823 from chrbauer/fix/pwsafe-1.09

pwsafe: 1.08.2 -> 1.09.0
This commit is contained in:
Jörg Thalheim 2020-03-18 21:24:58 +00:00 committed by GitHub
commit 50cabb2ca8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions

View File

@ -1,27 +1,28 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl { stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl
, wxGTK31, libXext, libXi, libXt, libXtst, xercesc , wxGTK30, libXext, libXi, libXt, libXtst, xercesc
, qrencode, libuuid, libyubikey, yubikey-personalization , qrencode, libuuid, libyubikey, yubikey-personalization
, curl, openssl , curl, openssl, file
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pwsafe"; pname = "pwsafe";
version = "1.08.2"; version = "1.09.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "${version}BETA"; rev = "${version}";
sha256 = "14qwk3cv5psj7ll71ikyv452x55c7iwjw9765yrpij6741r4yjln"; sha256 = "0dmazm95d53wq74qvsjvhl7r6fr4dv11nzf8sgdy47nyxv06xs1b";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake gettext perl pkgconfig zip cmake gettext perl pkgconfig zip
]; ];
buildInputs = [ buildInputs = [
libXext libXi libXt libXtst wxGTK31 libXext libXi libXt libXtst wxGTK30
curl qrencode libuuid openssl xercesc curl qrencode libuuid openssl xercesc
libyubikey yubikey-personalization libyubikey yubikey-personalization
file
]; ];
cmakeFlags = [ cmakeFlags = [