musescore: build with Qt 5.5

This commit is contained in:
Thomas Tuegel 2015-09-27 10:27:31 -05:00
parent 3935f63732
commit 3060396296
2 changed files with 5 additions and 4 deletions

View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl, cmake, pkgconfig { stdenv, fetchurl, cmake, pkgconfig
, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
, portaudio, qt5 #, tesseract , portaudio, qtbase, qtdeclarative, qtenginio, qtscript, qtsvg, qttools
, qtwebkit, qtxmlpatterns
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -36,8 +37,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
portaudio qt5.base qt5.declarative qt5.enginio qt5.script qt5.svg qt5.tools portaudio qtbase qtdeclarative qtenginio qtscript qtsvg qttools
qt5.webkit qt5.xmlpatterns #tesseract qtwebkit qtxmlpatterns #tesseract
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -12165,7 +12165,7 @@ let
iceSupport = config.murmur.iceSupport or true; iceSupport = config.murmur.iceSupport or true;
}; };
musescore = callPackage ../applications/audio/musescore { }; musescore = qt5Libs.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 {