Merge pull request #66285 from worldofpeace/mixxx

mixxx: drop custom wrapper
This commit is contained in:
worldofpeace
2019-08-07 13:27:30 -04:00
committed by GitHub
+4 -7
View File
@@ -1,4 +1,4 @@
{ stdenv, mkDerivation, fetchFromGitHub, makeWrapper, chromaprint { stdenv, mkDerivation, fetchFromGitHub, chromaprint
, fftw, flac, faad2, glibcLocales, mp4v2 , fftw, flac, faad2, glibcLocales, mp4v2
, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
, libGLU, libxcb, lilv, lv2, opusfile , libGLU, libxcb, lilv, lv2, opusfile
@@ -17,8 +17,6 @@ mkDerivation rec {
sha256 = "1q6c2wfpprsx7s7nz1w0mhm2yhikj54jxcv61kwylxx3n5k2na9r"; sha256 = "1q6c2wfpprsx7s7nz1w0mhm2yhikj54jxcv61kwylxx3n5k2na9r";
}; };
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 libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg
@@ -34,10 +32,9 @@ mkDerivation rec {
"opus=1" "opus=1"
]; ];
fixupPhase = '' qtWrapperArgs = [
wrapProgram $out/bin/mixxx \ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive; ];
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://mixxx.org; homepage = https://mixxx.org;