Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dfd115a11691
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f4654713a3ca
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 8, 2020

  1. tpm2-tss: fix build 

    Channel blocker https://hydra.nixos.org/build/109901320
    @worldofpeace
    worldofpeace committed Jan 8, 2020
    Copy the full SHA
    5b0c0bb View commit details

  2. Merge pull request #77325 from worldofpeace/tpm2-tss-fixbuild 

    tpm2-tss: fix build
    @worldofpeace
    worldofpeace authored Jan 8, 2020
    Copy the full SHA
    f465471 View commit details
Showing with 11 additions and 2 deletions.
  1. +11 −2 pkgs/development/libraries/tpm2-tss/default.nix
13 changes: 11 additions & 2 deletions pkgs/development/libraries/tpm2-tss/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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.