3
0
Fork 0
forked from mirrors/nixpkgs

mixxx: tidy up, remove obsolete patch, co-adopt

This commit is contained in:
Cillian de Róiste 2016-01-23 15:46:44 +01:00
parent 63485280dd
commit 85f9d04319

View file

@ -1,6 +1,7 @@
{ stdenv, fetchurl, scons, pkgconfig, qt4, portaudio, portmidi, libusb1 { stdenv, fetchurl, chromaprint, fftw, flac, libid3tag, libmad
, libmad, protobuf, libvorbis, taglib, libid3tag, flac, libsndfile, libshout , libopus, libshout, libsndfile, libusb1, libvorbis, pkgconfig
, rubberband, fftw, vampSDK, chromaprint, libopus, sqlite , portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
, taglib, vampSDK
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,9 +14,9 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
scons pkgconfig qt4 portaudio portmidi libusb1 libmad protobuf libvorbis chromaprint fftw flac libid3tag libmad libopus libshout libsndfile
taglib libid3tag flac libsndfile libshout rubberband fftw vampSDK chromaprint libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4
libopus sqlite rubberband scons sqlite taglib vampSDK
]; ];
sconsFlags = [ sconsFlags = [
@ -23,10 +24,6 @@ stdenv.mkDerivation rec {
"qtdir=${qt4}" "qtdir=${qt4}"
]; ];
postPatch = ''
sed -i -e 's/"which /"type -P /' build/depends.py
'';
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
mkdir -p "$out" mkdir -p "$out"
@ -42,11 +39,11 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
meta = { meta = with stdenv.lib; {
homepage = "http://mixxx.org/"; homepage = http://mixxx.org;
description = "Digital DJ mixing software"; description = "Digital DJ mixing software";
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.aszlig ]; maintainers = [ maintainers.aszlig maintainers.goibhniu ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }