6 files changed, 104 insertions, 39 deletions
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index e741f6fe29825..220d2d38e145d 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/gtkpod/${pname}-${version}.tar.gz";
     sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
   };
+  postPatch = ''
+    sed -i 's/which/type -P/' scripts/*.sh
+  '';
 
   nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ];
   buildInputs = [
@@ -19,15 +22,17 @@ stdenv.mkDerivation rec {
     gdl gnome.adwaita-icon-theme gnome.anjuta
   ] ++ (with perlPackages; [ perl XMLParser ]);
 
-  patchPhase = ''
-    sed -i 's/which/type -P/' scripts/*.sh
-  '';
+  # Workaround build failure on -fno-common toolchains like upstream
+  # gcc-10. Otherwise build fails as:
+  #   ld: .libs/autodetection.o:/build/gtkpod-2.1.5/libgtkpod/gtkpod_app_iface.h:248: multiple definition of
+  #       `gtkpod_app'; .libs/gtkpod_app_iface.o:/build/gtkpod-2.1.5/libgtkpod/gtkpod_app_iface.h:248: first defined here
+  NIX_CFLAGS_COMPILE = "-fcommon";
 
   enableParallelBuilding = true;
 
   meta = with lib; {
     description = "GTK Manager for an Apple ipod";
-    homepage = "http://gtkpod.sourceforge.net";
+    homepage = "https://sourceforge.net/projects/gtkpod/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.skeidel ];
diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix
index ca51001dd62e1..af2ce6ae25bae 100644
--- a/pkgs/applications/audio/rhvoice/default.nix
+++ b/pkgs/applications/audio/rhvoice/default.nix
@@ -1,36 +1,50 @@
-{ stdenv, lib, pkg-config, fetchFromGitHub, sconsPackages
-, glibmm, libpulseaudio, libao }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, ensureNewerSourcesForZipFilesHook
+, pkg-config
+, scons
+, glibmm
+, libpulseaudio
+, libao
+, speechd
+}:
 
-let
-  version = "unstable-2018-02-10";
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "rhvoice";
-  inherit version;
+  version = "1.8.0";
 
   src = fetchFromGitHub {
-    owner = "Olga-Yakovleva";
+    owner = "RHVoice";
     repo = "RHVoice";
-    rev = "7a25a881b0465e47a12d8029b56f3b71a1d02312";
-    sha256 = "1gkrlmv7msh9qlm0gkjqpl9gswghpclfdwszr1p85v8vk6m63v0b";
+    rev = version;
+    fetchSubmodules = true;
+    hash = "sha256-G5886rjBaAp0AXcr07O0q7K1OXTayfIbd4zniKwDiLw=";
   };
 
+  patches = [
+    # SConstruct patch
+    #     Scons creates an independent environment that assumes standard POSIX paths.
+    #     The patch is needed to push the nix environment.
+    #     - PATH
+    #     - PKG_CONFIG_PATH, to find available (sound) libraries
+    #     - RPATH, to link to the newly built libraries
+    ./honor_nix_environment.patch
+  ];
+
   nativeBuildInputs = [
-    sconsPackages.scons_3_1_2 pkg-config
+    ensureNewerSourcesForZipFilesHook
+    pkg-config
+    scons
   ];
 
   buildInputs = [
-    glibmm libpulseaudio libao
+    glibmm
+    libpulseaudio
+    libao
+    speechd
   ];
 
-  # SConstruct patch
-  #     Scons creates an independent environment that assumes standard POSIX paths.
-  #     The patch is needed to push the nix environment.
-  #     - PATH
-  #     - PKG_CONFIG_PATH, to find available (sound) libraries
-  #     - RPATH, to link to the newly built libraries
-
-  patches = [ ./honor_nix_environment.patch ];
-
   meta = {
     description = "A free and open source speech synthesizer for Russian language and others";
     homepage = "https://github.com/Olga-Yakovleva/RHVoice/wiki";
diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch
index ed180c92debc3..fed5a2ea5e1da 100644
--- a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch
+++ b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch
@@ -1,14 +1,31 @@
 diff --git a/SConstruct b/SConstruct
-index 2421399..ba39254 100644
+index 3ad4d9a..fb02365 100644
 --- a/SConstruct
 +++ b/SConstruct
-@@ -147,6 +147,9 @@ def create_base_env(vars):
+@@ -94,11 +94,8 @@ def CheckWiX(context):
+     return result
+ 
+ def get_spd_module_dir():
+-    env = Environment()
+-    try:
+-        return env.ParseConfig("pkg-config speech-dispatcher --variable=modulebindir", passthru)
+-    except:
+-        return False
++    # cannot write to ${speechd}/libexec/speech-dispatcher-modules
++    return os.path.join(os.environ["out"], "libexec/speech-dispatcher-modules")
+ 
+ def validate_spd_version(key,val,env):
+     m=re.match(r"^\d+\.\d+",val)
+@@ -208,9 +205,9 @@ def create_base_env(user_vars):
      env_args["package_name"]="RHVoice"
      env_args["CPPDEFINES"]=[("RHVOICE","1")]
      env=Environment(**env_args)
+-    if env["dev"]:
+-        env["prefix"]=os.path.abspath("local")
+-        env["RPATH"]=env.Dir("$libdir").abspath
 +    env.PrependENVPath("PATH", os.environ["PATH"])
 +    env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"]
-+    env["RPATH"]=env["libdir"]
++    env["RPATH"]=env.Dir("$libdir").abspath
      env["package_version"]=get_version(env["release"])
      env.Append(CPPDEFINES=("PACKAGE",env.subst(r'\"$package_name\"')))
-     env.Append(CPPDEFINES=("VERSION",env.subst(r'\"$package_version\"')))
+     if env["PLATFORM"]=="win32":
diff --git a/pkgs/applications/audio/sony-headphones-client/default.nix b/pkgs/applications/audio/sony-headphones-client/default.nix
index e3e6573c43241..127b2a5b1a93e 100644
--- a/pkgs/applications/audio/sony-headphones-client/default.nix
+++ b/pkgs/applications/audio/sony-headphones-client/default.nix
@@ -19,26 +19,35 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-Wno-dev" ];
 
+  patches = [ ./gcc.patch ];
+
+  postPatch = ''
+    substituteInPlace Constants.h \
+      --replace "UNKNOWN = -1" "// UNKNOWN removed since it doesn't fit in char"
+  '';
+
   installPhase = ''
     runHook preInstall
     install -Dm755 -t $out/bin SonyHeadphonesClient
     runHook postInstall
   '';
 
-  desktopItems = [ (makeDesktopItem {
-    name = "SonyHeadphonesClient";
-    exec = "SonyHeadphonesClient";
-    icon = "SonyHeadphonesClient";
-    desktopName = "Sony Headphones Client";
-    comment     = "A client recreating the functionality of the Sony Headphones app";
-    categories  = [ "Audio" "Mixer" ];
-  }) ];
+  desktopItems = [
+    (makeDesktopItem {
+      name = "SonyHeadphonesClient";
+      exec = "SonyHeadphonesClient";
+      icon = "SonyHeadphonesClient";
+      desktopName = "Sony Headphones Client";
+      comment = "A client recreating the functionality of the Sony Headphones app";
+      categories = [ "Audio" "Mixer" ];
+    })
+  ];
 
   meta = with lib; {
     description = "A client recreating the functionality of the Sony Headphones app";
-    homepage    = "https://github.com/Plutoberth/SonyHeadphonesClient";
-    license     = licenses.mit;
+    homepage = "https://github.com/Plutoberth/SonyHeadphonesClient";
+    license = licenses.mit;
     maintainers = with maintainers; [ stunkymonkey ];
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/sony-headphones-client/gcc.patch b/pkgs/applications/audio/sony-headphones-client/gcc.patch
new file mode 100644
index 0000000000000..31050e4789e72
--- /dev/null
+++ b/pkgs/applications/audio/sony-headphones-client/gcc.patch
@@ -0,0 +1,19 @@
+diff --git a/SingleInstanceFuture.h b/SingleInstanceFuture.h
+index 8af733f..d2e6c49 100644
+--- a/SingleInstanceFuture.h
++++ b/SingleInstanceFuture.h
+@@ -12,13 +12,13 @@ template <class T>
+ class SingleInstanceFuture : public std::future<T>
+ {
+ public:
+-	SingleInstanceFuture<T>() = default;
++	SingleInstanceFuture(void) = default;
+ 	template<class Func, class... Args>
+ 	void setFromAsync(Func func, Args&&... args) noexcept(false);
+ 	bool ready();
+ 
+ private:
+-	SingleInstanceFuture<T>(std::future<T> other);
++	SingleInstanceFuture(std::future<T> other);
+ 	SingleInstanceFuture<T> operator=(std::future<T>& other);
+ };
diff --git a/pkgs/applications/audio/sptlrx/default.nix b/pkgs/applications/audio/sptlrx/default.nix
index 40d43d207fb3d..4daab47047380 100644
--- a/pkgs/applications/audio/sptlrx/default.nix
+++ b/pkgs/applications/audio/sptlrx/default.nix
@@ -27,6 +27,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Spotify lyrics in your terminal";
     homepage = "https://github.com/raitonoberu/sptlrx";
+    changelog = "https://github.com/raitonoberu/sptlrx/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ MoritzBoehme ];
   };