sony-headphones-client: patch gcc-20 support
This commit is contained in:
parent
88be12e5dd
commit
f8e9160a67
@ -19,20 +19,29 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
cmakeFlags = [ "-Wno-dev" ];
|
cmakeFlags = [ "-Wno-dev" ];
|
||||||
|
|
||||||
|
patches = [ ./gcc.patch ];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace Constants.h \
|
||||||
|
--replace "UNKNOWN = -1" "// UNKNOWN removed since it doesn't fit in char"
|
||||||
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
install -Dm755 -t $out/bin SonyHeadphonesClient
|
install -Dm755 -t $out/bin SonyHeadphonesClient
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
desktopItems = [ (makeDesktopItem {
|
desktopItems = [
|
||||||
|
(makeDesktopItem {
|
||||||
name = "SonyHeadphonesClient";
|
name = "SonyHeadphonesClient";
|
||||||
exec = "SonyHeadphonesClient";
|
exec = "SonyHeadphonesClient";
|
||||||
icon = "SonyHeadphonesClient";
|
icon = "SonyHeadphonesClient";
|
||||||
desktopName = "Sony Headphones Client";
|
desktopName = "Sony Headphones Client";
|
||||||
comment = "A client recreating the functionality of the Sony Headphones app";
|
comment = "A client recreating the functionality of the Sony Headphones app";
|
||||||
categories = [ "Audio" "Mixer" ];
|
categories = [ "Audio" "Mixer" ];
|
||||||
}) ];
|
})
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A client recreating the functionality of the Sony Headphones app";
|
description = "A client recreating the functionality of the Sony Headphones app";
|
||||||
|
19
pkgs/applications/audio/sony-headphones-client/gcc.patch
Normal file
19
pkgs/applications/audio/sony-headphones-client/gcc.patch
Normal file
@ -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);
|
||||||
|
};
|
Loading…
Reference in New Issue
Block a user