commit ac1dd9de6ce5e3040c49101f21f204744905f418 · pyrox.dev/nixpkgs

+10 -5
pkgs/tools/security/cie-middleware-linux/default.nix
···

       20
       20
        
       

     

       21
       21
        
       let

     

       22
       22
        
         pname = "cie-middleware-linux";

     

       23
       23
       -
         version = "1.4.4.0";

     

       23
       23
       +
         version = "1.5.0";

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "M0rf30";

     

       27
       27
        
           repo = pname;

     

       28
       28
       -
           rev = "${version}-podofo";

     

       29
       29
       -
           sha256 = "sha256-Kyr9OTiY6roJ/wVJS/1aWfrrzDNQbuRTJQqo0akbMUU=";

     

       28
       28
       +
           rev = version;

     

       29
       29
       +
           sha256 = "sha256-Z8K2Ibg5bBfSql5HEapKgdfiCf/EIKTTD15oVeysQGk=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         gradle = gradle_7;

     
···

       44
       44
        
           buildPhase = ''

     

       45
       45
        
             # Run the fetchDeps task

     

       46
       46
        
             export GRADLE_USER_HOME=$(mktemp -d)

     

       47
       47
       +
             ls -l

     

       47
       48
        
             gradle --no-daemon -b cie-java/build.gradle fetchDeps

     

       48
       49
        
           '';

     

       49
       50
        
       

     
···

       60
       61
        
       

     

       61
       62
        
           outputHashAlgo = "sha256";

     

       62
       63
        
           outputHashMode = "recursive";

     

       63
       63
       -
           outputHash = "sha256-WzT5vYF9yCMU2A7EkLZyjgWrN3gD7pnkPXc3hDFqpD8=";

     

       64
       64
       +
           outputHash = "sha256-jtaH8dBpnx8KMJe+jzJfkvcx1NO4nL5jsRO4+GI+d0c=";

     

       64
       65
        
         };

     

       65
       66
        
       

     

       66
       67
        
       in

     
···

       84
       85
        
         buildInputs = [

     

       85
       86
        
           cryptopp

     

       86
       87
        
           fontconfig

     

       87
       87
       -
           podofo

     

       88
       88
       +
           podofo.dev

     

       88
       89
        
           openssl

     

       89
       90
        
           pcsclite

     

       90
       91
        
           curl

     
···

       95
       96
        
           # substitute the cieid command with this $out/bin/cieid

     

       96
       97
        
           substituteInPlace libs/pkcs11/src/CSP/AbilitaCIE.cpp \

     

       97
       98
        
             --replace 'file = "cieid"' 'file = "'$out'/bin/cieid"'

     

       99
       99
       +
       

     

       100
       100
       +
           # revert https://github.com/M0Rf30/cie-middleware-linux/commit/1a389d8

     

       101
       101
       +
           sed -i libs/meson.build \

     

       102
       102
       +
               -e "s@podofo_dep = .\+@podofo_dep = dependency('libpodofo')@g"

     

       98
       103
        
         '';

     

       99
       104
        
       

     

       100
       105
        
         # Note: we use pushd/popd to juggle between the