Skip to content

Commit

Permalink
faac: fix build with glibc-2.25
Browse files Browse the repository at this point in the history
Use patches from Arch to really build against the provided external
mp4v2 library.
  • Loading branch information
fpletz committed Feb 26, 2017
1 parent 8e1b4b3 commit 8fcd1a0
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions pkgs/development/libraries/faac/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl
{ stdenv, fetchurl, fetchpatch, autoreconfHook
, mp4v2Support ? true, mp4v2 ? null
, drmSupport ? false # Digital Radio Mondiale
}:
Expand All @@ -15,12 +15,28 @@ stdenv.mkDerivation rec {
sha256 = "1pqr7nf6p2r283n0yby2czd3iy159gz8rfinkis7vcfgyjci2565";
};

patches = [
(fetchpatch {
name = "faac-mp4v2-1.9.patch";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/mp4v2-1.9.patch?h=packages/faac";
sha256 = "1pja822zw9q3cg8bjkw5z0bpxsk4q92qix26zpiqbvi7vg314hyc";
})
(fetchpatch {
name = "faac-mp4v2-2.0.0.patch";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/mp4v2-2.0.0.patch?h=packages/faac";
sha256 = "07kmkrl0600rs01xqpkkw9n8p1215n485xqf8hwimp60dw3vc0wn";
addPrefixes = true;
})
];

configureFlags = [ ]
++ optional mp4v2Support "--with-mp4v2"
++ optional mp4v2Support "--with-external-mp4v2"
++ optional drmSupport "--enable-drm";

hardeningDisable = [ "format" ];

nativeBuildInputs = [ autoreconfHook ];

buildInputs = [ ]
++ optional mp4v2Support mp4v2;

Expand Down

0 comments on commit 8fcd1a0

Please sign in to comment.