From 3060396296889c65f04460af53e4022958f0e147 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:27:31 -0500 Subject: [PATCH] musescore: build with Qt 5.5 --- pkgs/applications/audio/musescore/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 7f34d5df550e..9dbfc96d5717 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis -, portaudio, qt5 #, tesseract +, portaudio, qtbase, qtdeclarative, qtenginio, qtscript, qtsvg, qttools +, qtwebkit, qtxmlpatterns }: stdenv.mkDerivation rec { @@ -36,8 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis - portaudio qt5.base qt5.declarative qt5.enginio qt5.script qt5.svg qt5.tools - qt5.webkit qt5.xmlpatterns #tesseract + portaudio qtbase qtdeclarative qtenginio qtscript qtsvg qttools + qtwebkit qtxmlpatterns #tesseract ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 731ed0d03195..a1f3449a6a9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12165,7 +12165,7 @@ let iceSupport = config.murmur.iceSupport or true; }; - musescore = callPackage ../applications/audio/musescore { }; + musescore = qt5Libs.callPackage ../applications/audio/musescore { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt {