wip

NixOS · Mar 7, 2018 · 71ea20d · 71ea20d
1 parent cc4677c
commit 71ea20d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
@@ -1,16 +1,20 @@
-{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, faad2, mp4v2
-, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
-, pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, scons
+, qtbase, qttools, qtscript, qtsvg, qtxmlpatterns
+, chromaprint, fftw, flac, faad2, mp4v2, libid3tag, libmad
+, libopus, libshout, libsndfile, libusb1, libvorbis, mesa
+, portaudio, portmidi, protobuf, rubberband, sqlite
 , taglib, vampSDK
 }:
 
 stdenv.mkDerivation rec {
   name = "mixxx-${version}";
   version = "2.0.0";
 
-  src = fetchurl {
-    url = "http://downloads.mixxx.org/${name}/${name}-src.tar.gz";
-    sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71";
+  src = fetchFromGitHub {
+    owner = "mixxxdj";
+    repo = "mixxx";
+    rev = "release-${version}";
+    sha256 = "0pipmkv5fig2pajlh5nnmxyfil7mv5l86cw6rh8jbkcr9hman9bp";
   };
 
   patches = [
@@ -27,36 +31,47 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     chromaprint fftw flac faad2 mp4v2 libid3tag libmad libopus libshout libsndfile
-    libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4
-    rubberband scons sqlite taglib vampSDK
+    libusb1 libvorbis mesa portaudio portmidi protobuf
+    rubberband sqlite taglib vampSDK
+    qtbase qtscript qtsvg qtxmlpatterns
   ];
 
+  nativeBuildInputs = [
+    pkgconfig qttools scons
+  ];
+
+  enableParallelBuilding = true;
+
   sconsFlags = [
     "build=release"
-    "qtdir=${qt4}"
     "faad=1"
+    "qt5=1"
   ];
 
   buildPhase = ''
     runHook preBuild
+
     mkdir -p "$out"
     scons \
       -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
       $sconsFlags "prefix=$out"
+
     runHook postBuild
   '';
 
   installPhase = ''
     runHook preInstall
+
     scons $sconsFlags "prefix=$out" install
+
     runHook postInstall
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://mixxx.org;
     description = "Digital DJ mixing software";
+    homepage = https://mixxx.org;
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.aszlig maintainers.goibhniu ];
+    maintainers = with maintainers; [ aszlig goibhniu ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -16456,7 +16456,7 @@ with pkgs;
 
   mirage = callPackage ../applications/graphics/mirage { };
 
-  mixxx = callPackage ../applications/audio/mixxx {
+  mixxx = libsForQt5.callPackage ../applications/audio/mixxx {
     inherit (vamp) vampSDK;
   };