cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #209567 from QuantMint/qalculate-qt6

Browse source 
qalculate-qt: build with qt6
This commit is contained in:
ajs124 2023-01-09 11:47:20 +01:00 committed by GitHub
commit 9830366cd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/science/math/qalculate-qt/default.nix
View file

@ -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";

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

@ -11034,7 +11034,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 { };