diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-01-13 10:49:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-13 10:49:35 -0500 |
| commit | 493e7e962155e52f72e55dc9e2f7657e56b68db7 (patch) | |
| tree | 7b21d5632ff065b3422fb12534bafeb8329b30cc /pkgs/applications/audio | |
| parent | 5d689f2014b5ad6c9547a678089b68e7896f5c2d (diff) | |
| parent | 9771113f7c390fa56a5437b318417b27290c13d8 (diff) | |
Merge pull request #280699 from a-n-n-a-l-e-e/radiotray-ng-fix
radiotray-ng: fix gcc13 errors with upstream patch
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/radiotray-ng/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 63e2bd7f2dccd..ce3f571623663 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , cmake, pkg-config # Transport , curl @@ -65,7 +65,14 @@ stdenv.mkDerivation rec { ] ++ gstInputs ++ pythonInputs; - patches = [ ./no-dl-googletest.patch ]; + patches = [ + ./no-dl-googletest.patch + (fetchpatch { + name = "gcc13-fixes.patch"; + url = "https://github.com/ebruck/radiotray-ng/commit/7a99bfa784f77be8f160961d25ab63dc2d5ccde0.patch"; + hash = "sha256-7x3v0dp9WPgd/vsnxezgXIZGsBrIHkTwIiu+FMlLmyA="; + }) + ]; postPatch = '' for x in package/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do |