Unverified Commit 493e7e96 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #280699 from a-n-n-a-l-e-e/radiotray-ng-fix

radiotray-ng: fix gcc13 errors with upstream patch
parents 5d689f20 9771113f
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
{ 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