diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-08 11:30:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 11:30:28 -0500 |
| commit | f4654713a3ca1820f0ff674ccf091d0cd0fcc8ff (patch) | |
| tree | cddd634f75ad7f33557ba2d9ad1913d288e19d29 /pkgs | |
| parent | dfd115a116913a6ca9c2058856029c754833073b (diff) | |
| parent | 5b0c0bbc08be8bc13136cd49dc43b1e8029df952 (diff) | |
| download | nixpkgs-f4654713a3ca1820f0ff674ccf091d0cd0fcc8ff.tar nixpkgs-f4654713a3ca1820f0ff674ccf091d0cd0fcc8ff.tar.gz nixpkgs-f4654713a3ca1820f0ff674ccf091d0cd0fcc8ff.tar.bz2 nixpkgs-f4654713a3ca1820f0ff674ccf091d0cd0fcc8ff.tar.lz nixpkgs-f4654713a3ca1820f0ff674ccf091d0cd0fcc8ff.tar.xz nixpkgs-f4654713a3ca1820f0ff674ccf091d0cd0fcc8ff.tar.zst nixpkgs-f4654713a3ca1820f0ff674ccf091d0cd0fcc8ff.zip | |
Merge pull request #77325 from worldofpeace/tpm2-tss-fixbuild
tpm2-tss: fix build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/tpm2-tss/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 3ad33615b3e..6195c80e24b 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, fetchpatch , cmocka, doxygen, ibm-sw-tpm2, iproute, openssl, perl, pkgconfig, procps -, uthash, which }: +, uthash, which +}: stdenv.mkDerivation rec { pname = "tpm2-tss"; @@ -11,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "19jg09sxy3aj4dc1yv32jjv0m62cnmhjlw02jbh4d4pk2439m4l2"; }; + patches = [ + # Fix test failure. see https://github.com/tpm2-software/tpm2-tss/pull/1585 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/tpm2-software/tpm2-tss/pull/1585.patch"; + sha256 = "0ak3l588ahzv3yx1gfa4sa6p74lsffxzkr23ppznm34wvlcci86n"; + }) + ]; + nativeBuildInputs = [ doxygen perl pkgconfig # For unit tests and integration tests. |