JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sony-headphones-client: patch gcc-20 support

Browse Source
This commit is contained in:
Felix Buehler 2022-05-15 12:24:50 +02:00
parent 88be12e5dd
commit f8e9160a67
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/applications/audio/sony-headphones-client/default.nix
View File

@ -19,26 +19,35 @@ 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 = [
name = "SonyHeadphonesClient"; (makeDesktopItem {
exec = "SonyHeadphonesClient"; name = "SonyHeadphonesClient";
icon = "SonyHeadphonesClient"; exec = "SonyHeadphonesClient";
desktopName = "Sony Headphones Client"; icon = "SonyHeadphonesClient";
comment = "A client recreating the functionality of the Sony Headphones app"; desktopName = "Sony Headphones Client";
categories = [ "Audio" "Mixer" ]; comment = "A client recreating the functionality of the Sony Headphones app";
}) ]; 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";
homepage = "https://github.com/Plutoberth/SonyHeadphonesClient"; homepage = "https://github.com/Plutoberth/SonyHeadphonesClient";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ stunkymonkey ]; maintainers = with maintainers; [ stunkymonkey ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

19
pkgs/applications/audio/sony-headphones-client/gcc.patch Normal file
View 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);
};