diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 4c84fb3c3f77..8d8d8d854754 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,33 +1,33 @@ { stdenv, fetchFromGitHub, makeWrapper, chromaprint, fetchpatch , fftw, flac, faad2, glibcLocales, mp4v2 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis -, opusfile -, pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite -, taglib, upower, vampSDK +, libGLU, libxcb, lilv, lv2, opusfile +, pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg +, qtx11extras, rubberband, scons, sqlite, taglib, upower, vampSDK }: stdenv.mkDerivation rec { name = "mixxx-${version}"; - version = "2.1.5"; + version = "2.2.0"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = "release-${version}"; - sha256 = "0h14pwglz03sdmgzviypv1qa1xfjclrnhyqaq5nd60j47h4z39dr"; + sha256 = "1rp2nyhz2j695k5kk0m94x30akwrlr9jgs0n4pi4snnvjpwmbfp9"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile - libusb1 libvorbis opusfile pkgconfig portaudio portmidi protobuf qt4 - rubberband scons sqlite taglib upower vampSDK + libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg + qtx11extras rubberband scons sqlite taglib upower vampSDK ]; sconsFlags = [ "build=release" - "qtdir=${qt4}" + "qtdir=${qtbase}" "faad=1" "opus=1" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d02836ea33b2..1a821c55f31f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18545,7 +18545,7 @@ in mirage = callPackage ../applications/graphics/mirage { }; - mixxx = callPackage ../applications/audio/mixxx { + mixxx = libsForQt5.callPackage ../applications/audio/mixxx { inherit (vamp) vampSDK; };