diff options
| author | Piotr Bogdan <ppbogdan@gmail.com> | 2017-11-08 16:53:36 +0000 |
|---|---|---|
| committer | Piotr Bogdan <ppbogdan@gmail.com> | 2017-11-08 17:35:48 +0000 |
| commit | 2704fdd710c69381f69ab435eadc5ea7d09f2bec (patch) | |
| tree | 3f13652a7dde8457c56e904513111593b54196e7 | |
| parent | 45108b47d59653c52bd9ad160075186bffb7ed2b (diff) | |
| download | nixlib-2704fdd710c69381f69ab435eadc5ea7d09f2bec.tar nixlib-2704fdd710c69381f69ab435eadc5ea7d09f2bec.tar.gz nixlib-2704fdd710c69381f69ab435eadc5ea7d09f2bec.tar.bz2 nixlib-2704fdd710c69381f69ab435eadc5ea7d09f2bec.tar.lz nixlib-2704fdd710c69381f69ab435eadc5ea7d09f2bec.tar.xz nixlib-2704fdd710c69381f69ab435eadc5ea7d09f2bec.tar.zst nixlib-2704fdd710c69381f69ab435eadc5ea7d09f2bec.zip | |
mlt: fix build with glibc-2.26
see https://github.com/mltframework/mlt/pull/248
| -rw-r--r-- | pkgs/development/libraries/mlt/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/libraries/mlt/qt-5.nix | 12 |
2 files changed, 26 insertions, 1 deletions
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 168b94495a97..6eee8df5a23e 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ stdenv, fetchFromGitHub, fetchurl, makeWrapper , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate , libvorbis, libxml2, movit, pkgconfig, sox , gtk2 @@ -15,6 +15,19 @@ stdenv.mkDerivation rec { sha256 = "0k9vj21n6qxdjd0vvj22cwi35igajjzh5fbjza766izdbijv2i2w"; }; + patches = [ + # fix for glibc-2.26 + (fetchurl { + url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch"; + sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a"; + }) + # fix for glibc-2.26 + (fetchurl { + url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch"; + sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv"; + }) + ]; + buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 makeWrapper movit pkgconfig sox diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 1d56d58c68d3..35221c91aa70 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -11,6 +11,18 @@ stdenv.mkDerivation rec { url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; sha256 = "10m3ry0b2pvqx3bk34qh5dq337nn8pkc2gzfyhsj4nv9abskln47"; }; + patches = [ + # fix for glibc-2.26 + (fetchurl { + url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch"; + sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a"; + }) + # fix for glibc-2.26 + (fetchurl { + url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch"; + sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv"; + }) + ]; buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 |