From 7f1a5d7f8d3a66cdc6518b70eb77f5f4d75dffdf Mon Sep 17 00:00:00 2001 From: QuantMint Date: Sat, 7 Jan 2023 22:38:04 +0100 Subject: [PATCH] qalculate-qt: build with qt6 --- .../science/math/qalculate-qt/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index f55551af3803..dbcacb36be6b 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, intltool, pkg-config, qmake, wrapQtAppsHook, libqalculate, qtbase, qttools }: +{ lib, stdenv, fetchFromGitHub, intltool, pkg-config, qmake, wrapQtAppsHook, libqalculate, qtbase, qttools, qtsvg, qtwayland }: stdenv.mkDerivation rec { pname = "qalculate-qt"; @@ -8,11 +8,16 @@ stdenv.mkDerivation rec { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${version}"; - sha256 = "sha256-1MU/Wici+NQWbjoNpE9q6jKx8aKt85OAfb+ZsN/oK5w="; + hash = "sha256-1MU/Wici+NQWbjoNpE9q6jKx8aKt85OAfb+ZsN/oK5w="; }; nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ]; - buildInputs = [ libqalculate qtbase qttools ]; + buildInputs = [ libqalculate qtbase qttools qtsvg qtwayland ]; + + postPatch = '' + substituteInPlace qalculate-qt.pro\ + --replace "LRELEASE" "${qttools.dev}/bin/lrelease" + ''; meta = with lib; { description = "The ultimate desktop calculator"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da5fc449453e..bf3231227130 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11036,7 +11036,7 @@ with pkgs; qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { }; - qalculate-qt = libsForQt5.callPackage ../applications/science/math/qalculate-qt { }; + qalculate-qt = qt6Packages.callPackage ../applications/science/math/qalculate-qt { }; qastools = libsForQt5.callPackage ../tools/audio/qastools { };