diff options
author | Cillian de Róiste <deroiste@syslab.com> | 2016-01-23 15:46:44 +0100 |
---|---|---|
committer | Cillian de Róiste <deroiste@syslab.com> | 2016-01-23 15:47:41 +0100 |
commit | 85f9d04319116a3cd631f5068154272e06a39100 (patch) | |
tree | 2948dc872cf16d5b4c1df5e715f00197e2a3df27 /pkgs | |
parent | 63485280ddabbf0abac62b04e5642c32d0b1d34a (diff) | |
download | nixpkgs-85f9d04319116a3cd631f5068154272e06a39100.tar nixpkgs-85f9d04319116a3cd631f5068154272e06a39100.tar.gz nixpkgs-85f9d04319116a3cd631f5068154272e06a39100.tar.bz2 nixpkgs-85f9d04319116a3cd631f5068154272e06a39100.tar.lz nixpkgs-85f9d04319116a3cd631f5068154272e06a39100.tar.xz nixpkgs-85f9d04319116a3cd631f5068154272e06a39100.tar.zst nixpkgs-85f9d04319116a3cd631f5068154272e06a39100.zip |
mixxx: tidy up, remove obsolete patch, co-adopt
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/audio/mixxx/default.nix | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 3dcae7a50a6..d7cdfcf0d08 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, scons, pkgconfig, qt4, portaudio, portmidi, libusb1 -, libmad, protobuf, libvorbis, taglib, libid3tag, flac, libsndfile, libshout -, rubberband, fftw, vampSDK, chromaprint, libopus, sqlite +{ stdenv, fetchurl, chromaprint, fftw, flac, libid3tag, libmad +, libopus, libshout, libsndfile, libusb1, libvorbis, pkgconfig +, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite +, taglib, vampSDK }: stdenv.mkDerivation rec { @@ -13,9 +14,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ - scons pkgconfig qt4 portaudio portmidi libusb1 libmad protobuf libvorbis - taglib libid3tag flac libsndfile libshout rubberband fftw vampSDK chromaprint - libopus sqlite + chromaprint fftw flac libid3tag libmad libopus libshout libsndfile + libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4 + rubberband scons sqlite taglib vampSDK ]; sconsFlags = [ @@ -23,10 +24,6 @@ stdenv.mkDerivation rec { "qtdir=${qt4}" ]; - postPatch = '' - sed -i -e 's/"which /"type -P /' build/depends.py - ''; - buildPhase = '' runHook preBuild mkdir -p "$out" @@ -42,11 +39,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = { - homepage = "http://mixxx.org/"; + meta = with stdenv.lib; { + homepage = http://mixxx.org; description = "Digital DJ mixing software"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.aszlig ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.aszlig maintainers.goibhniu ]; + platforms = platforms.linux; }; } |