colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #172833 from wamserma/tpmmanager-fix-build

Browse Source
This commit is contained in:
Artturi 2022-05-19 02:09:00 +03:00 committed by GitHub
commit 133cecb461
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/misc/tpmmanager/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, trousers }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, qtbase, qmake, wrapQtAppsHook, trousers }:
stdenv.mkDerivation rec {
version = "0.8.1";
@ -8,12 +8,24 @@ stdenv.mkDerivation rec {
owner = "Rohde-Schwarz";
repo = "TPMManager";
rev = "v${version}";
sha256 = "sha256-JKYG+I/tZ+0NDmHcIgKV6eGrjbPvPQKPo0sE/zBlLY4=";
sha256 = "sha256-UZYn4ssbvLpdB0DssT7MXqQZCu1KkLf/Bsb45Rvgm+E=";
};
nativeBuildInputs = [ qmake4Hook ];
patches = [
# build with Qt5
(fetchpatch {
url = "https://github.com/Rohde-Schwarz/TPMManager/commit/f62c0f2de2097af9b504c80d6193818e6e4ca84f.patch";
sha256 = "sha256-gMhDNN2UkX2lJf/oJEzOkCvF6+EGdIj9xwtXb1rCeys=";
})
(fetchpatch {
url = "https://github.com/Rohde-Schwarz/TPMManager/commit/c287a841ac6b057ed35799949211866b9f533561.patch";
sha256 = "sha256-2ZyUml8Q9bKQLVZWr18AzLt8VYLICXH9VDeq6B5Xfto=";
})
];
buildInputs = [ qt4 trousers ];
nativeBuildInputs = [ qmake wrapQtAppsHook ];
buildInputs = [ qtbase trousers ];
installPhase = ''
mkdir -p $out/bin

2
pkgs/top-level/all-packages.nix
View File

@ -10972,7 +10972,7 @@ with pkgs;
toybox = callPackage ../tools/misc/toybox { };
tpmmanager = callPackage ../applications/misc/tpmmanager { };
tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { };
tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { };