nitrokey-app2: 2.3.5 -> 2.4.1, fix SVG display

https://github.com/Nitrokey/nitrokey-app2/releases/tag/v2.4.1
https://github.com/Nitrokey/nitrokey-app2/releases/tag/v2.4.0

Fix the wrapping with Qt plugin paths to restore display of SVG icons
and to fix a warning about missing wayland plugin.

Closes #438004

Changed files
+33 -14
pkgs
tools
security
nitrokey-app2
top-level
+32 -13
pkgs/tools/security/nitrokey-app2/default.nix
···
{
lib,
stdenv,
-
python3,
+
buildPythonApplication,
fetchFromGitHub,
-
wrapQtAppsHook,
-
qtbase,
-
qtwayland,
-
qtsvg,
+
poetry-core,
+
fido2,
+
nitrokey,
+
pyside6,
+
usb-monitor,
+
qt6,
}:
-
python3.pkgs.buildPythonApplication rec {
+
let
+
inherit (qt6)
+
wrapQtAppsHook
+
qtbase
+
qtwayland
+
qtsvg
+
;
+
in
+
+
buildPythonApplication rec {
pname = "nitrokey-app2";
-
version = "2.3.5";
+
version = "2.4.1";
pyproject = true;
-
-
disabled = python3.pythonOlder "3.9";
src = fetchFromGitHub {
owner = "Nitrokey";
repo = "nitrokey-app2";
tag = "v${version}";
-
hash = "sha256-zhTDr4GyE4jridK3ee8ae3v5behMbuo86q9WdrBVqQg=";
+
hash = "sha256-nzhhtnKKOHA+Cw1y+BpYsyQklzkDnmFRKGIfaJ/dmaQ=";
};
-
nativeBuildInputs = with python3.pkgs; [
-
poetry-core
+
nativeBuildInputs = [
wrapQtAppsHook
];
···
qtsvg
];
-
propagatedBuildInputs = with python3.pkgs; [
+
build-system = [
+
poetry-core
+
];
+
+
dependencies = [
+
fido2
nitrokey
pyside6
usb-monitor
···
postInstall = ''
install -Dm755 meta/com.nitrokey.nitrokey-app2.desktop $out/share/applications/com.nitrokey.nitrokey-app2.desktop
install -Dm755 meta/nk-app2.png $out/share/icons/hicolor/128x128/apps/com.nitrokey.nitrokey-app2.png
+
'';
+
+
# wrapQtApps only wrapps binary files and normally skips python programs.
+
# Manually pass the qtWrapperArgs from wrapQtAppsHook to wrap python programs.
+
preFixup = ''
+
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
meta = with lib; {
+1 -1
pkgs/top-level/all-packages.nix
···
nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { };
-
nitrokey-app2 = qt6Packages.callPackage ../tools/security/nitrokey-app2 { };
+
nitrokey-app2 = python3Packages.callPackage ../tools/security/nitrokey-app2 { };
hy = with python3Packages; toPythonApplication hy;