diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2023-10-22 09:44:31 -0400 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2023-10-22 18:29:30 -0400 |
| commit | 34c88b1293608b1d0b029082e555c8b577fbbaa9 (patch) | |
| tree | 3601a3a8c3896c5fbd38f1ad55abd4eae5c6282c /pkgs/development/libraries/libshout/default.nix | |
| parent | b9e9e443a9e65726388ea4d6e74e1535cdfd8e8e (diff) | |
| download | nixpkgs-34c88b1293608b1d0b029082e555c8b577fbbaa9.tar nixpkgs-34c88b1293608b1d0b029082e555c8b577fbbaa9.tar.gz nixpkgs-34c88b1293608b1d0b029082e555c8b577fbbaa9.tar.bz2 nixpkgs-34c88b1293608b1d0b029082e555c8b577fbbaa9.tar.lz nixpkgs-34c88b1293608b1d0b029082e555c8b577fbbaa9.tar.xz nixpkgs-34c88b1293608b1d0b029082e555c8b577fbbaa9.tar.zst nixpkgs-34c88b1293608b1d0b029082e555c8b577fbbaa9.zip | |
libshout: fix build with clang 16
* Upstream MR includes several missing headers that were resulting in implicit function declaration errors.
Diffstat (limited to 'pkgs/development/libraries/libshout/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libshout/default.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 75fc2afbf18..e9547cc2af9 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -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 @@ -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 ]; |