Merge pull request #71956 from marsam/fix-libogg-darwin

libogg: fix build on darwin
2019-10-25 08:49:41 -05:00
parent 8e0563e7e6 b2b77b3b5e
commit d6fc52b8ca
1 changed files with 9 additions and 1 deletions
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:

 stdenv.mkDerivation rec {
  name = "libogg-1.3.4";
@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {

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

+  patches = stdenv.lib.optionals stdenv.isDarwin [
+    # Fix unsigned typedefs on darwin. Remove with the next release https://github.com/xiph/ogg/pull/64
+    (fetchpatch {
+      url = "https://github.com/xiph/ogg/commit/c8fca6b4a02d695b1ceea39b330d4406001c03ed.patch";
+      sha256 = "1s72g37y87x0a74zjji9vx2hyk86kr4f2l3m4y2fipvlf9348b3f";
+    })
+  ];
+
  meta = with stdenv.lib; {
    description = "Media container library to manipulate Ogg files";
    longDescription = ''