diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-11-19 16:49:21 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-19 16:51:12 +0100 |
commit | b9c0b3f126472b144c543d8d77a8047e8d905ada (patch) | |
tree | 2ad99b8789bcb62b993ed18d2877905f7f02bdac /nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix | |
parent | 67419f0e56f99b0ebbe14574d3492110ac84c8d6 (diff) | |
parent | c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad (diff) | |
download | nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.gz nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.bz2 nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.lz nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.xz nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.zst nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/top-level/perl-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix b/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix index 012d492aacad..de260e068249 100644 --- a/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, lib, openssl }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, openssl +}: stdenv.mkDerivation rec { pname = "ibm-sw-tpm2"; @@ -9,6 +14,18 @@ stdenv.mkDerivation rec { hash = "sha256-PLZC+HGheyPVCwRuX5X0ScIodBX8HnrrS9u4kg28s48="; }; + patches = [ + # Backport openssl-3.1 from development branch. + # Can be removed with next release. + (fetchpatch { + name = "openssl-3.1.patch"; + url = "https://github.com/kgoldman/ibmswtpm2/commit/15501bf4973d334ca9420fa2fb0f0fe1800871e0.patch"; + includes = [ "TpmToOsslMath.h" ]; + stripLen = 1; + hash = "sha256-8TwyZVy8pQwq5Fl8cy9xJWtdckwL+QK0+DL5EHDLYUY="; + }) + ]; + buildInputs = [ openssl ]; sourceRoot = "src"; |