diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/lirc | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/lirc')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/lirc/default.nix | 16 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/lirc/linux-headers-5.18.patch | 35 |
2 files changed, 46 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/lirc/default.nix b/nixpkgs/pkgs/development/libraries/lirc/default.nix index d5f84455f836..68b3b86a9eec 100644 --- a/nixpkgs/pkgs/development/libraries/lirc/default.nix +++ b/nixpkgs/pkgs/development/libraries/lirc/default.nix @@ -10,11 +10,17 @@ stdenv.mkDerivation rec { sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb"; }; - # Fix installation of Python bindings - patches = [ (fetchpatch { - url = "https://sourceforge.net/p/lirc/tickets/339/attachment/0001-Fix-Python-bindings.patch"; - sha256 = "088a39x8c1qd81qwvbiqd6crb2lk777wmrs8rdh1ga06lglyvbly"; - }) ]; + patches = [ + # Fix installation of Python bindings + (fetchpatch { + url = "https://sourceforge.net/p/lirc/tickets/339/attachment/0001-Fix-Python-bindings.patch"; + sha256 = "088a39x8c1qd81qwvbiqd6crb2lk777wmrs8rdh1ga06lglyvbly"; + }) + + # Add a workaround for linux-headers-5.18 until upstream adapts: + # https://sourceforge.net/p/lirc/git/merge-requests/45/ + ./linux-headers-5.18.patch + ]; postPatch = '' patchShebangs . diff --git a/nixpkgs/pkgs/development/libraries/lirc/linux-headers-5.18.patch b/nixpkgs/pkgs/development/libraries/lirc/linux-headers-5.18.patch new file mode 100644 index 000000000000..733c423b7a83 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/lirc/linux-headers-5.18.patch @@ -0,0 +1,35 @@ +--- a/daemons/lircd.cpp ++++ b/daemons/lircd.cpp +@@ -110,6 +110,17 @@ int clock_gettime(int clk_id, struct timespec *t){ + #endif + #define WHITE_SPACE " \t" + ++/* Defines removed in linux-headers-5.18: ++ https://sourceforge.net/p/lirc/git/merge-requests/45/ ++ */ ++#ifndef LIRC_CAN_SET_REC_FILTER ++# define LIRC_CAN_SET_REC_FILTER 0x08000000 ++#endif ++ ++#ifndef LIRC_CAN_NOTIFY_DECODE ++# define LIRC_CAN_NOTIFY_DECODE 0x01000000 ++#endif ++ + static const logchannel_t logchannel = LOG_APP; + + /** How long we sleep while waiting for busy write sockets. */ +--- a/tools/lirc-lsplugins.cpp ++++ b/tools/lirc-lsplugins.cpp +@@ -21,6 +21,12 @@ + #include "config.h" + #include "lirc_private.h" + ++/* Defines removed in linux-headers-5.18: ++ https://sourceforge.net/p/lirc/git/merge-requests/45/ ++ */ ++#ifndef LIRC_CAN_NOTIFY_DECODE ++# define LIRC_CAN_NOTIFY_DECODE 0x01000000 ++#endif + + #define USAGE \ + "\nSynopsis:\n" \ |