about summary refs log tree commit diff
path: root/pkgs/applications/audio/mixxx/default.nix
diff options
context:
space:
mode:
authorCillian de Róiste <cillian.deroiste@gmail.com>2017-08-30 17:56:21 +0200
committerCillian de Róiste <cillian.deroiste@gmail.com>2017-08-30 17:57:27 +0200
commit769c44d9d87b4a2f39bd1f854fd5a506cd517150 (patch)
tree5d6173c6df9221e131f3b2475969aa18638ec525 /pkgs/applications/audio/mixxx/default.nix
parent5b70a2f1e555b802f5302489136675ec6edba61e (diff)
mixxx: patch to build with gcc6 (via debian)
Also, get the sqlite patch directly from bugs.gentoo.org.
Diffstat (limited to 'pkgs/applications/audio/mixxx/default.nix')
-rw-r--r--pkgs/applications/audio/mixxx/default.nix14
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 0bf7472ea1150..6d353344b07fb 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, chromaprint, fftw, flac, libid3tag, libmad
+{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, libid3tag, libmad
 , libopus, libshout, libsndfile, libusb1, libvorbis, pkgconfig
 , portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
 , taglib, vampSDK
@@ -13,7 +13,17 @@ stdenv.mkDerivation rec {
     sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71";
   };
 
-  patches = [ ./sqlite.patch ]; # from: https://bugs.gentoo.org/show_bug.cgi?id=622776
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/m/mixxx/2.0.0~dfsg-7.1/debian/patches/0007-fix_gcc6_issue.patch";
+      sha256 = "0kpyv10wcjcvbijk6vpq54gx9sqzrq4kq2qilc1czmisp9qdy5sd";
+    })
+    (fetchpatch {
+      url = "https://622776.bugs.gentoo.org/attachment.cgi?id=487284";
+      name = "sqlite.patch";
+      sha256 = "1qqbd8nrxrjcc1dwvyqfq1k2yz3l071sfcgd2dmpk6j8d4j5kx31";
+    })
+ ];
 
   buildInputs = [
     chromaprint fftw flac libid3tag libmad libopus libshout libsndfile