Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8e0563e7e661
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d6fc52b8caec
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 25, 2019

  1. libogg: fix build on darwin

    @marsam
    marsam committed Oct 25, 2019
    Copy the full SHA
    b2b77b3 View commit details

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

    libogg: fix build on darwin
    @marsam
    marsam authored Oct 25, 2019
    Copy the full SHA
    d6fc52b View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/development/libraries/libogg/default.nix
10 changes: 9 additions & 1 deletion pkgs/development/libraries/libogg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = ''