Skip to content

Commit

Permalink
frescobaldi: 2.0.16 -> 3.0.0; fix build
Browse files Browse the repository at this point in the history
3.0.0 works with Python 3 and QT5 (proivded by pyqt5). These fixes are
another step towards #32883 by getting rid of the unused poppler-qt4.

See https://hydra.nixos.org/build/71816154/log
See ticket #36453

(cherry picked from commit 545495b)
  • Loading branch information
Ma27 authored and Robert Schütz committed Mar 31, 2018
1 parent 29a6d29 commit 97afec4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 36 deletions.
25 changes: 13 additions & 12 deletions pkgs/misc/frescobaldi/default.nix
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
{ stdenv, fetchurl, pythonPackages, lilypond}:
{ lib, fetchFromGitHub, python3Packages, lilypond }:

pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
name = "frescobaldi-${version}";
version = "2.0.16";
version = "3.0.0";

src = fetchurl {
url = "https://github.com/wbsoft/frescobaldi/releases/download/"
+ "v2.0.16/${name}.tar.gz";
sha256 = "12pabvq5b2lq84q3kx8lh02zh6ali6v4wnin2k2ycnm45mk9ms6q";
src = fetchFromGitHub {
owner = "wbsoft";
repo = "frescobaldi";
rev = "v${version}";
sha256 = "1yn18pwsjxpxz5j3yfysmaif8k0vqahj5c7ays9cxsylpg9hl7jd";
};

propagatedBuildInputs = with pythonPackages; [ lilypond
pyqt4 poppler-qt4 pygame ];
propagatedBuildInputs = with python3Packages; [ lilypond pygame python-ly poppler-qt5 ];

patches = [ ./setup.cfg.patch ./python-path.patch ];
# no tests in shipped with upstream
doCheck = false;

meta = with stdenv.lib; {
meta = with lib; {
homepage = http://frescobaldi.org/;
description = ''Frescobaldi is a LilyPond sheet music text editor'';
longDescription = ''
Expand All @@ -31,7 +32,7 @@ pythonPackages.buildPythonApplication rec {
fonts and keyboard shortcuts
'';
license = licenses.gpl2Plus;
maintainers = [ maintainers.sepi ];
maintainers = with maintainers; [ sepi ma27 ];
platforms = platforms.all;
};
}
11 changes: 0 additions & 11 deletions pkgs/misc/frescobaldi/python-path.patch

This file was deleted.

13 changes: 0 additions & 13 deletions pkgs/misc/frescobaldi/setup.cfg.patch

This file was deleted.

0 comments on commit 97afec4

Please sign in to comment.