14 files changed, 92 insertions, 67 deletions
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index dc805a8caf93..292f28554d08 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc
+{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, vlc
 , qtbase, qtmultimedia, qtsvg, qttools
 
 # Cantata doesn't build with cdparanoia enabled so we disable that
@@ -35,7 +35,7 @@ let
 
   withUdisks = (withTaglib && withDevices);
 
-in stdenv.mkDerivation rec {
+in mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
@@ -46,20 +46,20 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = [ vlc qtbase qtmultimedia qtsvg ]
-    ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
-    ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
-    ++ stdenv.lib.optional  withCdda cdparanoia
-    ++ stdenv.lib.optional  withCddb libcddb
-    ++ stdenv.lib.optional  withLame lame
-    ++ stdenv.lib.optional  withMtp libmtp
-    ++ stdenv.lib.optional  withMusicbrainz libmusicbrainz5
-    ++ stdenv.lib.optional  withUdisks udisks2;
+    ++ lib.optionals withTaglib [ taglib taglib_extras ]
+    ++ lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
+    ++ lib.optional  withCdda cdparanoia
+    ++ lib.optional  withCddb libcddb
+    ++ lib.optional  withLame lame
+    ++ lib.optional  withMtp libmtp
+    ++ lib.optional  withMusicbrainz libmusicbrainz5
+    ++ lib.optional  withUdisks udisks2;
 
   nativeBuildInputs = [ cmake pkgconfig qttools ];
 
   enableParallelBuilding = true;
 
-  cmakeFlags = stdenv.lib.flatten [
+  cmakeFlags = lib.flatten [
     (fstats withTaglib        [ "TAGLIB" "TAGLIB_EXTRAS" ])
     (fstats withReplaygain    [ "FFMPEG" "MPG123" "SPEEXDSP" ])
     (fstat withCdda           "CDPARANOIA")
@@ -76,7 +76,7 @@ in stdenv.mkDerivation rec {
     "-DENABLE_HTTPS_SUPPORT=ON"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = https://github.com/cdrummond/cantata;
     description = "A graphical client for MPD";
     license     = licenses.gpl3;
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 9fbcf8b7ac29..6d186cccde34 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, chromaprint
+{ stdenv, mkDerivation, fetchFromGitHub, chromaprint
 , fftw, flac, faad2, glibcLocales, mp4v2
 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
 , libGLU, libxcb, lilv, lv2, opusfile
@@ -6,7 +6,7 @@
 , qtx11extras, rubberband, scons, sqlite, taglib, upower, vampSDK
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "mixxx-${version}";
   version = "2.2.1";
 
@@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
     sha256 = "1q6c2wfpprsx7s7nz1w0mhm2yhikj54jxcv61kwylxx3n5k2na9r";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-
   buildInputs = [
     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
@@ -34,10 +32,9 @@ stdenv.mkDerivation rec {
     "opus=1"
   ];
 
-  fixupPhase = ''
-    wrapProgram $out/bin/mixxx \
-      --set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive;
-  '';
+  qtWrapperArgs = [
+    "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
+  ];
 
   meta = with stdenv.lib; {
     homepage = https://mixxx.org;
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 1ecb8be09ddf..04a62b5d159c 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint }:
+{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 }:
 
 let
   pythonPackages = python3Packages;
@@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec {
     sha256 = "1armg8vpvnbpk7rrfk9q7nj5gm56rza00ni9qwdyqpxp1xaz6apj";
   };
 
-  nativeBuildInputs = [ gettext ];
+  nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ];
 
   propagatedBuildInputs = with pythonPackages; [
     pyqt5
@@ -22,15 +22,16 @@ in pythonPackages.buildPythonApplication rec {
     discid
   ];
 
-  installPhase = ''
-    python setup.py install --prefix="$out"
-  '';
-
   prePatch = ''
     # Pesky unicode punctuation.
     substituteInPlace setup.cfg --replace "‘" "'"
   '';
 
+  installPhase = ''
+    python setup.py install --prefix="$out"
+    wrapQtApp $out/bin/picard
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://musicbrainz.org/doc/MusicBrainz_Picard;
     description = "The official MusicBrainz tagger";
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index f63b828a0a89..9989f75c0bd7 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -24,13 +24,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "pulseaudio-modules-bt-${version}";
-  version = "1.1.99";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "EHfive";
     repo = "pulseaudio-modules-bt";
     rev = "v${version}";
-    sha256 = "0x670xbd62r3fs9a8pa5p4ppvxn6m64hvlrqa702gvikcvyrmwcg";
+    sha256 = "00xmidcw4fvpbmg0nsm2gk5zw26fpyjbc0pjk6mzr570zbnyqqbn";
   };
 
   patches = [
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index fbb2f498c0b1..9b8c8035239d 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
+{ stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
 
-stdenv.mkDerivation rec {
-  version = "0.5.8";
+mkDerivation rec {
+  version = "0.5.9";
   name = "qjackctl-${version}";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
     url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "1r5hf3hcr20n93jrrm7xk2zf6yx264pcr4d10cpybhrancxh602n";
+    sha256 = "1saywsda9m124rmjp7i3n0llryaliabjxhqhvqr6dm983qy7pypk";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index b596e74a2649..16e76bb631c9 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.4";
+  version = "0.5.5";
   name = "qmidinet-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
-    sha256 = "1il4b8v3azb33yg4fy78npi56xlkz4n60f17sgvckyxb2yj57jwq";
+    sha256 = "0az20hh14g7k6h779dk1b6fshxnfj2664sj6ypgllzriwv430x9y";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
index b09aa835c9f2..4e6df82a32a9 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "qsampler-${version}";
-  version = "0.5.5";
+  version = "0.5.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/qsampler/${name}.tar.gz";
-    sha256 = "1li2p8zknrdr62wlaassfvgski0rlbr3lvrzywbh32dq8j50w8zf";
+    sha256 = "0lx2mzyajmjckwfvgf8p8bahzpj0n0lflyip41jk32nwd2hzjhbs";
   };
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ];
diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index b83804e16be9..2e504a3c9ec2 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -1,20 +1,21 @@
 { alsaLib, autoconf, automake, dssi, fetchurl, libjack2
 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
 , libtool, libvorbis, lilv, lv2, pkgconfig, qttools, qtbase, rubberband, serd
-, sord, sratom, stdenv, suil }:
+, sord, sratom, stdenv, suil, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "qtractor";
-  version = "0.9.8";
+  version = "0.9.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "1llajl450yh7bka32ngm4xdva6a2nnxzjc497ydh07rwkap16smx";
+    sha256 = "0qlbccdxyfy0f09y6qg1xkg12fm67bf2f2c27c22cg8lzk9ang5j";
   };
 
   nativeBuildInputs = [
-    autoconf automake libtool pkgconfig qttools
+    autoconf automake libtool pkgconfig qttools wrapQtAppsHook
   ];
+
   buildInputs =
     [ alsaLib dssi libjack2 ladspaH
       ladspaPlugins liblo libmad libsamplerate libsndfile libtool
diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix
index 9557770418e8..64deede535b2 100644
--- a/pkgs/applications/audio/spectmorph/default.nix
+++ b/pkgs/applications/audio/spectmorph/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "spectmorph-${version}";
-  version = "0.4.1";
+  version = "0.5.0";
   src = fetchurl {
     url = "http://spectmorph.org/files/releases/${name}.tar.bz2";
-    sha256 = "0z00yvv3jl8qsx6bz9msmg09mdnj5r5d4ws5bmnylwxk182whbrv";
+    sha256 = "003wznv3sy1b4g55vqii9pr3i3bb3zmj7nqvwrz7vjsfn2xyd1bn";
   };
 
   buildInputs = [  libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ];
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index f7b24aa28249..77aa79949943 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype
 , glib, pango, cairo, atk, gdk-pixbuf, gtk2, cups, nspr, nss, libpng, libnotify
 , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3
-, at-spi2-atk, at-spi2-core, apulse
+, at-spi2-atk
 }:
 
 let
@@ -10,22 +10,20 @@ let
   # If an update breaks things, one of those might have valuable info:
   # https://aur.archlinux.org/packages/spotify/
   # https://community.spotify.com/t5/Desktop-Linux
-  version = "1.1.10.546.ge08ef575-19";
+  version = "1.0.96.181.gf6bc1b6b-12";
   # To get the latest stable revision:
   # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
   # To get general information:
   # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
   # More examples of api usage:
   # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
-  rev = "36";
+  rev = "30";
 
 
   deps = [
     alsaLib
-    apulse
     atk
     at-spi2-atk
-    at-spi2-core
     cairo
     cups
     curl
@@ -74,7 +72,7 @@ stdenv.mkDerivation {
   # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
   src = fetchurl {
     url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
-    sha512 = "c49f1a86a9b737e64a475bbe62754a36f607669e908eb725a2395f0a0a6b95968e0c8ce27ab2c8b6c92fe8cbacb1ef58de11c79b92dc0f58c2c6d3a140706a1f";
+    sha512 = "859730fbc80067f0828f7e13eee9a21b13b749f897a50e17c2da4ee672785cfd79e1af6336e609529d105e040dc40f61b6189524783ac93d49f991c4ea8b3c56";
   };
 
   buildInputs = [ squashfsTools makeWrapper ];
@@ -136,8 +134,6 @@ stdenv.mkDerivation {
       librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir"
       wrapProgram $out/share/spotify/spotify \
         --prefix LD_LIBRARY_PATH : "$librarypath" \
-        --prefix LD_LIBRARY_PATH : "${apulse}/lib/apulse" \
-        --set APULSE_PLAYBACK_DEVICE plug:dmix \
         --prefix PATH : "${gnome3.zenity}/bin"
 
       # fix Icon line in the desktop file (#48062)
@@ -162,7 +158,7 @@ stdenv.mkDerivation {
     homepage = https://www.spotify.com/;
     description = "Play music from the Spotify music service";
     license = licenses.unfree;
-    maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau angristan ];
+    maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
index 5f064cf4e885..3daed9f63501 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1";
   };
 
-  cargoSha256 = "0879p1h32259schmy8j3xnwpw3sw80f8mrj8s6b5aihi3yyzz521";
+  cargoSha256 = "1dzg4sb95ixjfhx6n4w2rgrq4481vw01nsdrbm746mz7nm71csk3";
 
   cargoBuildFlags = [
     "--no-default-features"
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index 15935751c32a..2e55306029f0 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -5,13 +5,18 @@
 let
   glfw-git = glfw.overrideAttrs (oldAttrs: rec {
     name = "glfw-git-${version}";
-    version = "unstable-2018-05-29";
+    version = "2019-06-30";
     src = fetchFromGitHub {
-      owner = "glfw";
+      owner = "AndrewBelt";
       repo = "glfw";
-      rev = "0be4f3f75aebd9d24583ee86590a38e741db0904";
-      sha256 = "0zbcjgc7ks25yi949k0wjknfl00a4dqmz45mhp00k62vlq2sj0i5";
+      rev = "d9ab59efc781c392128a449361a381fcc93cf6f3";
+      sha256 = "1ykkq6qq8y6j5hlfj2zp1p87kr33vwhywziprz20v5avx1q7rjm8";
     };
+    # We patch the source to export a function that was added to the glfw fork
+    # for Rack so it is present when we build glfw as a shared library.
+    # See https://github.com/AndrewBelt/glfw/pull/1 for discussion of this issue
+    # with upstream.
+    patches = [ ./glfw.patch ];
     buildInputs = oldAttrs.buildInputs ++ [ libXext libXi ];
   });
   pfft-source = fetchFromBitbucket {
@@ -23,32 +28,31 @@ let
 in
 with stdenv.lib; stdenv.mkDerivation rec {
   name = "VCV-Rack-${version}";
-  version = "0.6.2b";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "VCVRack";
     repo = "Rack";
     rev = "v${version}";
-    sha256 = "17ynhxcci6dyn1yi871fd8yli4924fh12pmk510djwkcj5crhas6";
+    sha256 = "16q3x0jpwkdwwvh7rn472w7nfjf81s10z9c7bx011kk7rgk88hh2";
     fetchSubmodules = true;
   };
 
+  patches = [ ./rack-minimize-vendoring.patch ];
+
   prePatch = ''
-    ln -s ${pfft-source} dep/jpommier-pffft-source
+    cp -r ${pfft-source} dep/jpommier-pffft-source
 
     mkdir -p dep/include
 
     cp dep/jpommier-pffft-source/*.h dep/include
-    cp dep/nanosvg/src/*.h dep/include
+    cp dep/nanosvg/**/*.h dep/include
     cp dep/nanovg/src/*.h dep/include
     cp dep/osdialog/*.h dep/include
     cp dep/oui-blendish/*.h dep/include
 
     substituteInPlace include/audio.hpp --replace "<RtAudio.h>" "<rtaudio/RtAudio.h>"
     substituteInPlace compile.mk --replace "-march=nocona" ""
-    substituteInPlace Makefile \
-       --replace "-Wl,-Bstatic" "" \
-       --replace "-lglfw3" "-lglfw"
   '';
 
   enableParallelBuilding = true;
@@ -60,13 +64,12 @@ with stdenv.lib; stdenv.mkDerivation rec {
 
   installPhase = ''
     install -D -m755 -t $out/bin Rack
-    cp -r res $out/
 
-    mkdir -p $out/share/rack
-    cp LICENSE.txt LICENSE-dist.txt $out/share/rack
+    mkdir -p $out/share/vcv-rack
+    cp -r res Core.json template.vcv LICENSE* cacert.pem $out/share/vcv-rack
 
     # Override the default global resource file directory
-    wrapProgram $out/bin/Rack --add-flags "-g $out"
+    wrapProgram $out/bin/Rack --add-flags "-s $out/share/vcv-rack"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/vcv-rack/glfw.patch b/pkgs/applications/audio/vcv-rack/glfw.patch
new file mode 100644
index 000000000000..77875415160c
--- /dev/null
+++ b/pkgs/applications/audio/vcv-rack/glfw.patch
@@ -0,0 +1,13 @@
+diff --git a/src/init.c b/src/init.c
+index af4a579e..317e25b8 100644
+--- a/src/init.c
++++ b/src/init.c
+@@ -339,7 +339,7 @@ GLFWAPI GLFWerrorfun glfwSetErrorCallback(GLFWerrorfun cbfun)
+ 
+ char glfwOpenedFilename[1024];
+ 
+-const char *glfwGetOpenedFilename()
++GLFWAPI const char *glfwGetOpenedFilename()
+ {
+     if (glfwOpenedFilename[0])
+     {
diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
new file mode 100644
index 000000000000..eca9c2f13c06
--- /dev/null
+++ b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
@@ -0,0 +1,14 @@
+diff -ru a/Makefile b/Makefile
+--- a/Makefile	1970-01-01 01:00:01.000000000 +0100
++++ b/Makefile	1970-01-01 01:00:01.000000000 +0100
+@@ -21,8 +21,8 @@
+ build/dep/osdialog/osdialog_gtk2.c.o: FLAGS += $(shell pkg-config --cflags gtk+-2.0)
+ 
+ 	LDFLAGS += -rdynamic \
+-		dep/lib/libglfw3.a dep/lib/libGLEW.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/librtmidi.a dep/lib/librtaudio.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a \
+-		-lpthread -lGL -ldl -lX11 -lasound -ljack \
++		-lGLEW -ljansson -lspeexdsp -lzip -lz -lrtmidi -lrtaudio -lcurl -lssl -lcrypto \
++		-lpthread -lGL -ldl -lX11 -lasound -ljack -lglfw \
+ 		$(shell pkg-config --libs gtk+-2.0)
+ 	TARGET := Rack
+ endif