summary refs log tree commit diff
path: root/pkgs/os-specific/linux/ffado
diff options
context:
space:
mode:
authorPiotr Bogdan <ppbogdan@gmail.com>2017-11-08 17:35:07 +0000
committerPiotr Bogdan <ppbogdan@gmail.com>2017-11-08 17:35:51 +0000
commit1e78b48666273da16915fd251de505d6103a13dd (patch)
treef3d89965ad8f8c68dd3b890db3f9158ff91ba2a7 /pkgs/os-specific/linux/ffado
parent2704fdd710c69381f69ab435eadc5ea7d09f2bec (diff)
downloadnixpkgs-1e78b48666273da16915fd251de505d6103a13dd.tar
nixpkgs-1e78b48666273da16915fd251de505d6103a13dd.tar.gz
nixpkgs-1e78b48666273da16915fd251de505d6103a13dd.tar.bz2
nixpkgs-1e78b48666273da16915fd251de505d6103a13dd.tar.lz
nixpkgs-1e78b48666273da16915fd251de505d6103a13dd.tar.xz
nixpkgs-1e78b48666273da16915fd251de505d6103a13dd.tar.zst
nixpkgs-1e78b48666273da16915fd251de505d6103a13dd.zip
ffado: fix build with glibc-2.26
see https://sourceforge.net/p/ffado/mailman/message/36008067/
Diffstat (limited to 'pkgs/os-specific/linux/ffado')
-rw-r--r--pkgs/os-specific/linux/ffado/default.nix5
-rw-r--r--pkgs/os-specific/linux/ffado/glibc226.patch10
2 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 1ca503f33ec..aa273ec613e 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -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
diff --git a/pkgs/os-specific/linux/ffado/glibc226.patch b/pkgs/os-specific/linux/ffado/glibc226.patch
new file mode 100644
index 00000000000..e147ee9aa76
--- /dev/null
+++ b/pkgs/os-specific/linux/ffado/glibc226.patch
@@ -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