aboutsummaryrefslogtreecommitdiff
path: root/pkgs/misc/frescobaldi
diff options
context:
space:
mode:
authorpuzzlewolf <23097564+puzzlewolf@users.noreply.github.com>2020-01-03 18:24:59 +0100
committerDmitry Kalinkin <dmitry.kalinkin@gmail.com>2020-01-03 12:24:59 -0500
commitc5e72fa68681bdb9a07615ee340e5a0cab4a2782 (patch)
treefa67b671697b4d046393b44dc5df43e5e480c365 /pkgs/misc/frescobaldi
parent7c85d7db722bedbe46277ddc305cea10ff237d7f (diff)
frescobaldi: 3.0.0 -> 3.1 (#76889)
Diffstat (limited to 'pkgs/misc/frescobaldi')
-rw-r--r--pkgs/misc/frescobaldi/default.nix18
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix
index aae469f3005d..5487b6cdc2a7 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -1,24 +1,32 @@
-{ lib, fetchFromGitHub, python3Packages, lilypond }:
+{ lib, buildPythonApplication, fetchFromGitHub, python3Packages, pyqtwebengine, lilypond }:
-python3Packages.buildPythonApplication rec {
+buildPythonApplication rec {
name = "frescobaldi-${version}";
- version = "3.0.0";
+ version = "3.1";
src = fetchFromGitHub {
owner = "wbsoft";
repo = "frescobaldi";
rev = "v${version}";
- sha256 = "1yn18pwsjxpxz5j3yfysmaif8k0vqahj5c7ays9cxsylpg9hl7jd";
+ sha256 = "0sv6dc1l34rrhfbn1wqkl9zs9hiacmmbviw87d0d03987s1iirb1";
};
propagatedBuildInputs = with python3Packages; [
lilypond pygame python-ly sip
- pyqt5_with_qtwebkit (poppler-qt5.override { pyqt5 = pyqt5_with_qtwebkit; })
+ pyqt5 poppler-qt5
+ pyqtwebengine
];
+ nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
+
# no tests in shipped with upstream
doCheck = false;
+ dontWrapQtApps = true;
+ makeWrapperArgs = [
+ "\${qtWrapperArgs[@]}"
+ ];
+
meta = with lib; {
homepage = http://frescobaldi.org/;
description = ''Frescobaldi is a LilyPond sheet music text editor'';