musescore: 2.0.3 -> 2.1.0

This commit is contained in:
Jos van den Oever 2017-06-16 22:00:14 +02:00
parent dda6daa4ff
commit 6ee183b7f2
2 changed files with 5 additions and 7 deletions

View File

@ -1,16 +1,16 @@
{ stdenv, fetchzip, cmake, pkgconfig { stdenv, fetchzip, cmake, pkgconfig
, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
, portaudio, qtbase, qtdeclarative, qtenginio, qtscript, qtsvg, qttools , portaudio, qtbase, qtdeclarative, qtscript, qtsvg, qttools
, qtwebkit, qtxmlpatterns , qtwebkit, qtxmlpatterns
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "musescore-${version}"; name = "musescore-${version}";
version = "2.0.3"; version = "2.1.0";
src = fetchzip { src = fetchzip {
url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"; url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz";
sha256 = "067f4li48qfhz2barj70zpf2d2mlii12npx07jx9xjkkgz84z4c9"; sha256 = "1rlxz2nzilz7n6c0affnjk2wcxl4b8949qxs0xi555gxg01kybls";
}; };
hardeningDisable = [ "relro" "bindnow" ]; hardeningDisable = [ "relro" "bindnow" ];
@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
]; ];
preBuild = '' preBuild = ''
make lupdate
make lrelease make lrelease
''; '';
@ -45,7 +44,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
portaudio qtbase qtdeclarative qtenginio qtscript qtsvg qttools portaudio qtbase qtdeclarative qtscript qtsvg qttools
qtwebkit qtxmlpatterns #tesseract qtwebkit qtxmlpatterns #tesseract
]; ];
@ -56,6 +55,5 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.vandenoever ]; maintainers = [ maintainers.vandenoever ];
repositories.git = https://github.com/musescore/MuseScore; repositories.git = https://github.com/musescore/MuseScore;
broken = true;
}; };
} }

View File

@ -15086,7 +15086,7 @@ with pkgs;
if stdenv.isDarwin then if stdenv.isDarwin then
callPackage ../applications/audio/musescore/darwin.nix { } callPackage ../applications/audio/musescore/darwin.nix { }
else else
libsForQt56.callPackage ../applications/audio/musescore { }; libsForQt5.callPackage ../applications/audio/musescore { };
mutt = callPackage ../applications/networking/mailreaders/mutt { }; mutt = callPackage ../applications/networking/mailreaders/mutt { };
mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt {