mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 20:34:52 +03:00
tpm-tools: fix build by applying debians patch
This commit is contained in:
parent
119c287c71
commit
71d3b34bd7
@ -0,0 +1,30 @@
|
|||||||
|
Title: Fix boolean comparison error (and FTBFS with gcc-5)
|
||||||
|
Date: 2015-06-28
|
||||||
|
Author: Pierre Chifflier <pollux@debian.org>
|
||||||
|
Bug-Debian: http://bugs.debian.org/778147
|
||||||
|
Index: tpm-tools/src/tpm_mgmt/tpm_nvcommon.c
|
||||||
|
===================================================================
|
||||||
|
--- tpm-tools.orig/src/tpm_mgmt/tpm_nvcommon.c
|
||||||
|
+++ tpm-tools/src/tpm_mgmt/tpm_nvcommon.c
|
||||||
|
@@ -140,8 +140,8 @@ int parseStringWithValues(const char *aA
|
||||||
|
aArg);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
- if (!aArg[offset+numbytes] == '|' &&
|
||||||
|
- !aArg[offset+numbytes] == 0) {
|
||||||
|
+ if (!(aArg[offset+numbytes] == '|' ||
|
||||||
|
+ aArg[offset+numbytes] == 0)) {
|
||||||
|
logError(_("Illegal character following "
|
||||||
|
"hexadecimal number in %s\n"),
|
||||||
|
aArg + offset);
|
||||||
|
@@ -164,8 +164,8 @@ int parseStringWithValues(const char *aA
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (!aArg[offset+numbytes] == '|' &&
|
||||||
|
- !aArg[offset+numbytes] == 0) {
|
||||||
|
+ if (!(aArg[offset+numbytes] == '|' ||
|
||||||
|
+ aArg[offset+numbytes] == 0)) {
|
||||||
|
logError(_("Illegal character following decimal "
|
||||||
|
"number in %s\n"),
|
||||||
|
aArg + offset);
|
@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs = [ trousers openssl opencryptoki ];
|
buildInputs = [ trousers openssl opencryptoki ];
|
||||||
|
|
||||||
|
patches = [ ./03-fix-bool-error-parseStringWithValues.patch ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Management tools for TPM hardware";
|
description = "Management tools for TPM hardware";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
|
Loading…
Reference in New Issue
Block a user