diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index a94363f4600c..4523168314ae 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"; @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b895e2d84b3c..7552933a48ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };