Commit 1d03c7ce authored by Lorenz Brun's avatar Lorenz Brun
Browse files

osslsigncode: 2.5 -> 2.6 

The two patches got upstreamed into 2.6 and are no longer necessary.

This fixes PKCS#11 signers on Nix as it restores the ability to specify
a full path to the PKCS#11 engine shared object.
parent 43a72ede

pkgs/development/tools/osslsigncode/default.nix

+4 −17
Original line number Diff line number Diff line
@@ -2,37 +2,24 @@ 
, stdenv

, fetchFromGitHub

, cmake

, fetchpatch

, pkg-config

, python3

, curl

, openssl

}:



stdenv.mkDerivation rec {

  pname = "osslsigncode";

  version = "2.5";

  version = "2.6";



  src = fetchFromGitHub {

    owner = "mtrojnar";

    repo = pname;

    rev = version;

    sha256 = "sha256-33uT9PFD1YEIMzifZkpbl2EAoC98IsM72K4rRjDfh8g=";

    sha256 = "sha256-Lt99RO/pTEtksIuulkKTm48+1xUKZOHrnlbDZGi3VWk=";

  };



  patches = [

    # Cygwin patch is prereq for Darwin fix applying -- committed to master after 2.5 release

    (fetchpatch {

      url = "https://github.com/mtrojnar/osslsigncode/commit/1c678bf926b78c947b14c46c3ce88e06268c738e.patch";

      sha256 = "sha256-vOBMGIJ3PHJTvmsXRRfAUJRi7P929PcfmrUiRuM0pf4=";

    })

    # Fix build on Darwin when clang not identified as Apple (https://github.com/mtrojnar/osslsigncode/pull/247)

    (fetchpatch {

      url = "https://github.com/charles-dyfis-net/osslsigncode/commit/b2ed89b35c8a26faa7eb6515fecaff3c4c5f7fed.patch";

      sha256 = "sha256-FGKZK/IzHbbkTzSoAtpC75z79d5+qQvvJrjEDY31WJ0=";

    })

  ];



  nativeBuildInputs = [ cmake pkg-config ];

  nativeBuildInputs = [ cmake pkg-config python3 ];



  buildInputs = [ curl openssl ];