3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #218909 from SuperSandro2000/yubikey-manager-qt

yubikey-manager4: fix build
This commit is contained in:
Lassulus 2023-03-01 17:53:34 +05:30 committed by GitHub
commit 8c035c1fc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps { python3Packages, fetchFromGitHub, lib, installShellFiles, yubikey-personalization, libu2f-host, libusb1, procps
, stdenv, pyOpenSSLSupport ? !(stdenv.isDarwin && stdenv.isAarch64) }: , stdenv, pyOpenSSLSupport ? !(stdenv.isDarwin && stdenv.isAarch64) }:
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
@ -7,9 +7,9 @@ python3Packages.buildPythonPackage rec {
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Yubico";
repo = "yubikey-manager"; repo = "yubikey-manager";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
owner = "Yubico";
sha256 = "sha256-MwM/b1QP6pkyBjz/r6oC4sW1mKC0CKMay45a0wCktk0="; sha256 = "sha256-MwM/b1QP6pkyBjz/r6oC4sW1mKC0CKMay45a0wCktk0=";
}; };
@ -19,28 +19,28 @@ python3Packages.buildPythonPackage rec {
postPatch = '' postPatch = ''
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace 'fido2 = ">=0.9, <1.0"' 'fido2 = ">*"' --replace 'cryptography = ">=2.1, <39"' 'cryptography = ">=2.1"'
substituteInPlace "ykman/pcsc/__init__.py" \ substituteInPlace "ykman/pcsc/__init__.py" \
--replace 'pkill' '${if stdenv.isLinux then "${procps}" else "/usr"}/bin/pkill' --replace 'pkill' '${if stdenv.isLinux then "${procps}" else "/usr"}/bin/pkill'
''; '';
nativeBuildInputs = with python3Packages; [ poetry-core ]; nativeBuildInputs = [ installShellFiles ]
++ (with python3Packages; [ poetry-core ]);
propagatedBuildInputs = propagatedBuildInputs = with python3Packages; ([
with python3Packages; ([ click
click cryptography
cryptography pyscard
pyscard pyusb
pyusb six
six fido2
fido2 ] ++ lib.optionals pyOpenSSLSupport [
] ++ lib.optionals pyOpenSSLSupport [ pyopenssl
pyopenssl ]) ++ [
]) ++ [ libu2f-host
libu2f-host libusb1
libusb1 yubikey-personalization
yubikey-personalization ];
];
makeWrapperArgs = [ makeWrapperArgs = [
"--prefix" "LD_LIBRARY_PATH" ":" "--prefix" "LD_LIBRARY_PATH" ":"
@ -48,8 +48,7 @@ python3Packages.buildPythonPackage rec {
]; ];
postInstall = '' postInstall = ''
mkdir -p "$out/man/man1" installManPage man/ykman.1
cp man/ykman.1 "$out/man/man1"
mkdir -p $out/share/bash-completion/completions mkdir -p $out/share/bash-completion/completions
_YKMAN_COMPLETE=source $out/bin/ykman > $out/share/bash-completion/completions/ykman || : _YKMAN_COMPLETE=source $out/bin/ykman > $out/share/bash-completion/completions/ykman || :
@ -64,7 +63,6 @@ python3Packages.buildPythonPackage rec {
meta = with lib; { meta = with lib; {
homepage = "https://developers.yubico.com/yubikey-manager"; homepage = "https://developers.yubico.com/yubikey-manager";
description = "Previous release of command line tool for configuring any YubiKey over all USB transports"; description = "Previous release of command line tool for configuring any YubiKey over all USB transports";
license = licenses.bsd2; license = licenses.bsd2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ benley lassulus pinpox ]; maintainers = with maintainers; [ benley lassulus pinpox ];