diff options
Diffstat (limited to 'pkgs/applications/audio/sony-headphones-client')
| -rw-r--r-- | pkgs/applications/audio/sony-headphones-client/default.nix | 31 | ||||
| -rw-r--r-- | pkgs/applications/audio/sony-headphones-client/gcc.patch | 19 |
2 files changed, 39 insertions, 11 deletions
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); + }; |