Merge pull request #59108 from willtim/master

mixxx: 2.1.5 -> 2.2.0 (#53643) - QT5 version
This commit is contained in:
markuskowa
2019-04-09 20:03:58 +02:00
committed by GitHub
2 changed files with 9 additions and 9 deletions
+8 -8
View File
@@ -1,33 +1,33 @@
{ stdenv, fetchFromGitHub, makeWrapper, chromaprint, fetchpatch { stdenv, fetchFromGitHub, makeWrapper, chromaprint, fetchpatch
, fftw, flac, faad2, glibcLocales, mp4v2 , fftw, flac, faad2, glibcLocales, mp4v2
, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
, opusfile , libGLU, libxcb, lilv, lv2, opusfile
, pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite , pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg
, taglib, upower, vampSDK , qtx11extras, rubberband, scons, sqlite, taglib, upower, vampSDK
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mixxx-${version}"; name = "mixxx-${version}";
version = "2.1.5"; version = "2.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mixxxdj"; owner = "mixxxdj";
repo = "mixxx"; repo = "mixxx";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "0h14pwglz03sdmgzviypv1qa1xfjclrnhyqaq5nd60j47h4z39dr"; sha256 = "1rp2nyhz2j695k5kk0m94x30akwrlr9jgs0n4pi4snnvjpwmbfp9";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ buildInputs = [
chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile
libusb1 libvorbis opusfile pkgconfig portaudio portmidi protobuf qt4 libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg
rubberband scons sqlite taglib upower vampSDK qtx11extras rubberband scons sqlite taglib upower vampSDK
]; ];
sconsFlags = [ sconsFlags = [
"build=release" "build=release"
"qtdir=${qt4}" "qtdir=${qtbase}"
"faad=1" "faad=1"
"opus=1" "opus=1"
]; ];
+1 -1
View File
@@ -18545,7 +18545,7 @@ in
mirage = callPackage ../applications/graphics/mirage { }; mirage = callPackage ../applications/graphics/mirage { };
mixxx = callPackage ../applications/audio/mixxx { mixxx = libsForQt5.callPackage ../applications/audio/mixxx {
inherit (vamp) vampSDK; inherit (vamp) vampSDK;
}; };