ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

Merge #31402: mlt, ffado: fix includeds with glibc-2.26

Browse Source
This commit is contained in:
Vladimír Čunát 2017-11-08 23:01:47 +01:00
commit 94efde5119
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
4 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/mlt/default.nix
View File

@ -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

12
pkgs/development/libraries/mlt/qt-5.nix
View File

@ -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

5
pkgs/os-specific/linux/ffado/default.nix
View File

@ -41,7 +41,10 @@ stdenv.mkDerivation rec {
optXdg_utils libxmlxx glibmm
];
patches = [ ./gcc6.patch ];
patches = [
./gcc6.patch
./glibc226.patch
];
postPatch = ''
# SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch

10
pkgs/os-specific/linux/ffado/glibc226.patch Normal file
View File

@ -0,0 +1,10 @@
--- libffado/src/libutil/PosixMessageQueue.cpp (revision 2705)
+++ libffado/src/libutil/PosixMessageQueue.cpp (revision 2706)
@@ -30,6 +30,7 @@
#include <errno.h>
#include <string.h>
#include <poll.h>
+#include <signal.h>
#define MQ_INVALID_ID ((mqd_t) -1)
// one second