diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index d6f65f9c4c7..4523168314a 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -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"; @@ -11,9 +11,21 @@ stdenv.mkDerivation rec { 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09a710a0602..34049e03199 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10982,7 +10982,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 { };