Unverified Commit ac1dd9de authored by Michele Guerini Rocco's avatar Michele Guerini Rocco Committed by GitHub
Browse files

Merge pull request #264269 from rnhmjoj/pr-cie 

cie-middleware-linux: 1.4.4.0 -> 1.5.0
parents 7b0a2b8d 1152e785

pkgs/tools/security/cie-middleware-linux/default.nix

+10 −5
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 


let

  pname = "cie-middleware-linux";

  version = "1.4.4.0";

  version = "1.5.0";



  src = fetchFromGitHub {

    owner = "M0rf30";

    repo = pname;

    rev = "${version}-podofo";

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

    rev = version;

    sha256 = "sha256-Z8K2Ibg5bBfSql5HEapKgdfiCf/EIKTTD15oVeysQGk=";

  };



  gradle = gradle_7;
@@ -44,6 +44,7 @@ let 
    buildPhase = ''

      # Run the fetchDeps task

      export GRADLE_USER_HOME=$(mktemp -d)

      ls -l

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

    '';
@@ -60,7 +61,7 @@ let 


    outputHashAlgo = "sha256";

    outputHashMode = "recursive";

    outputHash = "sha256-WzT5vYF9yCMU2A7EkLZyjgWrN3gD7pnkPXc3hDFqpD8=";

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

  };



in
@@ -84,7 +85,7 @@ stdenv.mkDerivation { 
  buildInputs = [

    cryptopp

    fontconfig

    podofo

    podofo.dev

    openssl

    pcsclite

    curl
@@ -95,6 +96,10 @@ stdenv.mkDerivation { 
    # substitute the cieid command with this $out/bin/cieid

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

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



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

    sed -i libs/meson.build \

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

  '';



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