Merge pull request #26663 from vandenoever/musescore

musescore: 2.0.3 -> 2.1.0
This commit is contained in:
Joachim F 2017-06-19 14:29:03 +01:00 committed by GitHub
commit babfd23364
2 changed files with 5 additions and 7 deletions

View file

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

View file

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