Merge pull request #201231 from Stunkymonkey/sony-headphones-client-1.3.1

2 files changed, 2 insertions, 23 deletions

diff --git a/pkgs/applications/audio/sony-headphones-client/default.nix b/pkgs/applications/audio/sony-headphones-client/default.nix
index 127b2a5b1a93e..c4491cd2a0dc2 100644
--- a/pkgs/applications/audio/sony-headphones-client/default.nix
+++ b/pkgs/applications/audio/sony-headphones-client/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "SonyHeadphonesClient";
-  version = "1.2";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "Plutoberth";
     repo = "SonyHeadphonesClient";
     rev = "v${version}";
-    sha256 = "sha256-oejXrs9X+R6Jydro0XIw2XifzFA7asDhpobtaE3//Hc=";
+    hash = "sha256-0DQanrglJiGsN8qQ5KxkL8I+Fpt1abeeuKiM8v9GclM=";
     fetchSubmodules = true;
   };
 
@@ -19,8 +19,6 @@ 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"
diff --git a/pkgs/applications/audio/sony-headphones-client/gcc.patch b/pkgs/applications/audio/sony-headphones-client/gcc.patch
deleted file mode 100644
index 31050e4789e72..0000000000000
--- a/pkgs/applications/audio/sony-headphones-client/gcc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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);
- };