Skip to content

Commit

Permalink
Merge pull request #262820 from reckenrode/libshout-fix
Browse files Browse the repository at this point in the history
libshout: fix build with clang 16
  • Loading branch information
wegank authored Oct 27, 2023
2 parents 8948534 + 34c88b1 commit fd36865
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion pkgs/development/libraries/libshout/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config
{ lib, stdenv, fetchurl, fetchpatch, pkg-config
, libvorbis, libtheora, speex }:

# need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc
Expand All @@ -12,6 +12,19 @@ stdenv.mkDerivation rec {
sha256 = "sha256-OcvU8O/f3cl1XYghfkf48tcQj6dn+dWKK6JqFtj3yRA=";
};

patches = [
# Fixes building libshout with clang. Can be dropped once the following MR is merged:
# https://gitlab.xiph.org/xiph/icecast-libshout/-/merge_requests/4.
(fetchpatch {
url = "https://gitlab.xiph.org/xiph/icecast-libshout/-/commit/600fa105a799986efcccddfedfdfd3e9a1988cd0.patch";
hash = "sha256-XjogfcQJBPZX9MPAbNJyXaFZNekL1pabvtTT7N+cz+s=";
})
(fetchpatch {
url = "https://gitlab.xiph.org/xiph/icecast-libshout/-/commit/8ab2de318d55c9d0987ffae7d9b94b365af732c1.patch";
hash = "sha256-0+Wp2Xu59ESCJfoDcwAJHuAJyzMsaBe7f8Js3/ren2g=";
})
];

outputs = [ "out" "dev" "doc" ];

depsBuildBuild = [ pkg-config ];
Expand Down

0 comments on commit fd36865

Please sign in to comment.