mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 23:52:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

osslsigncode: 2.5 -> 2.6

Browse Source 
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.
This commit is contained in:
Lorenz Brun 2023-08-21 23:04:28 +02:00
parent 43a72edefb
commit 1d03c7ced0
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/tools/osslsigncode/default.nix
View File

@ -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 ];