diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-02-26 19:09:29 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-02-26 19:09:29 +0100 |
| commit | 8fcd1a063e2564d0f337a41a7db3cd49f5fb031f (patch) | |
| tree | 4937ec59bd72b9e5e4bbcf9ca9477209ad6071c0 /pkgs/development/libraries/faac | |
| parent | 8e1b4b3c4c372c07347eb9106615c8791bcc753b (diff) | |
| download | nixlib-8fcd1a063e2564d0f337a41a7db3cd49f5fb031f.tar nixlib-8fcd1a063e2564d0f337a41a7db3cd49f5fb031f.tar.gz nixlib-8fcd1a063e2564d0f337a41a7db3cd49f5fb031f.tar.bz2 nixlib-8fcd1a063e2564d0f337a41a7db3cd49f5fb031f.tar.lz nixlib-8fcd1a063e2564d0f337a41a7db3cd49f5fb031f.tar.xz nixlib-8fcd1a063e2564d0f337a41a7db3cd49f5fb031f.tar.zst nixlib-8fcd1a063e2564d0f337a41a7db3cd49f5fb031f.zip | |
faac: fix build with glibc-2.25
Use patches from Arch to really build against the provided external mp4v2 library.
Diffstat (limited to 'pkgs/development/libraries/faac')
| -rw-r--r-- | pkgs/development/libraries/faac/default.nix | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 1ab01033f4df..abbe07224b56 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, fetchpatch, autoreconfHook , mp4v2Support ? true, mp4v2 ? null , drmSupport ? false # Digital Radio Mondiale }: @@ -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; |