commit 4a135469532e7764108c578317638dc79385594e · pyrox.dev/nixpkgs

+32 -13

pkgs/tools/security/nitrokey-app2/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
       -
         python3,

     

       4
       4
       +
         buildPythonApplication,

     

       5
       5
        
         fetchFromGitHub,

     

       6
       6
       -
         wrapQtAppsHook,

     

       7
       7
       -
         qtbase,

     

       8
       8
       -
         qtwayland,

     

       9
       9
       -
         qtsvg,

     

       6
       6
       +
         poetry-core,

     

       7
       7
       +
         fido2,

     

       8
       8
       +
         nitrokey,

     

       9
       9
       +
         pyside6,

     

       10
       10
       +
         usb-monitor,

     

       11
       11
       +
         qt6,

     

       10
       12
        
       }:

     

       11
       13
        
       

     

       12
       12
       -
       python3.pkgs.buildPythonApplication rec {

     

       14
       14
       +
       let

     

       15
       15
       +
         inherit (qt6)

     

       16
       16
       +
           wrapQtAppsHook

     

       17
       17
       +
           qtbase

     

       18
       18
       +
           qtwayland

     

       19
       19
       +
           qtsvg

     

       20
       20
       +
           ;

     

       21
       21
       +
       in

     

       22
       22
       +
       

     

       23
       23
       +
       buildPythonApplication rec {

     

       13
       24
        
         pname = "nitrokey-app2";

     

       14
       14
       -
         version = "2.3.5";

     

       25
       25
       +
         version = "2.4.1";

     

       15
       26
        
         pyproject = true;

     

       16
       16
       -
       

     

       17
       17
       -
         disabled = python3.pythonOlder "3.9";

     

       18
       27
        
       

     

       19
       28
        
         src = fetchFromGitHub {

     

       20
       29
        
           owner = "Nitrokey";

     

       21
       30
        
           repo = "nitrokey-app2";

     

       22
       31
        
           tag = "v${version}";

     

       23
       23
       -
           hash = "sha256-zhTDr4GyE4jridK3ee8ae3v5behMbuo86q9WdrBVqQg=";

     

       32
       32
       +
           hash = "sha256-nzhhtnKKOHA+Cw1y+BpYsyQklzkDnmFRKGIfaJ/dmaQ=";

     

       24
       33
        
         };

     

       25
       34
        
       

     

       26
       26
       -
         nativeBuildInputs = with python3.pkgs; [

     

       27
       27
       -
           poetry-core

     

       35
       35
       +
         nativeBuildInputs = [

     

       28
       36
        
           wrapQtAppsHook

     

       29
       37
        
         ];

     

       30
       38
        
       

     
···

       36
       44
        
           qtsvg

     

       37
       45
        
         ];

     

       38
       46
        
       

     

       39
       39
       -
         propagatedBuildInputs = with python3.pkgs; [

     

       47
       47
       +
         build-system = [

     

       48
       48
       +
           poetry-core

     

       49
       49
       +
         ];

     

       50
       50
       +
       

     

       51
       51
       +
         dependencies = [

     

       52
       52
       +
           fido2

     

       40
       53
        
           nitrokey

     

       41
       54
        
           pyside6

     

       42
       55
        
           usb-monitor

     
···

       51
       64
        
         postInstall = ''

     

       52
       65
        
           install -Dm755 meta/com.nitrokey.nitrokey-app2.desktop $out/share/applications/com.nitrokey.nitrokey-app2.desktop

     

       53
       66
        
           install -Dm755 meta/nk-app2.png $out/share/icons/hicolor/128x128/apps/com.nitrokey.nitrokey-app2.png

     

       67
       67
       +
         '';

     

       68
       68
       +
       

     

       69
       69
       +
         # wrapQtApps only wrapps binary files and normally skips python programs.

     

       70
       70
       +
         # Manually pass the qtWrapperArgs from wrapQtAppsHook to wrap python programs.

     

       71
       71
       +
         preFixup = ''

     

       72
       72
       +
           makeWrapperArgs+=("''${qtWrapperArgs[@]}")

     

       54
       73
        
         '';

     

       55
       74
        
       

     

       56
       75
        
         meta = with lib; {

+1 -1

pkgs/top-level/all-packages.nix

···

       15560
       15560
        
       

     

       15561
       15561
        
         nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { };

     

       15562
       15562
        
       

     

       15563
       15563
       -
         nitrokey-app2 = qt6Packages.callPackage ../tools/security/nitrokey-app2 { };

     

       15563
       15563
       +
         nitrokey-app2 = python3Packages.callPackage ../tools/security/nitrokey-app2 { };

     

       15564
       15564
        
       

     

       15565
       15565
        
         hy = with python3Packages; toPythonApplication hy;

     

       15566
       15566