diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-11 06:00:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-11 06:00:54 +0000 |
| commit | 1e3b05e37fcf4048fdefa0a9971e3b598c89626a (patch) | |
| tree | a388056ce5b45aa86ca04e9e0d1881604ea017dd /pkgs/applications | |
| parent | b826485d293df9b6625cc545c2785f66a391fc85 (diff) | |
| parent | e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d (diff) | |
| download | nixlib-1e3b05e37fcf4048fdefa0a9971e3b598c89626a.tar nixlib-1e3b05e37fcf4048fdefa0a9971e3b598c89626a.tar.gz nixlib-1e3b05e37fcf4048fdefa0a9971e3b598c89626a.tar.bz2 nixlib-1e3b05e37fcf4048fdefa0a9971e3b598c89626a.tar.lz nixlib-1e3b05e37fcf4048fdefa0a9971e3b598c89626a.tar.xz nixlib-1e3b05e37fcf4048fdefa0a9971e3b598c89626a.tar.zst nixlib-1e3b05e37fcf4048fdefa0a9971e3b598c89626a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/video/rtabmap/default.nix | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix index ba6470af873f..28dd626502e8 100644 --- a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "20.11.1"; + version = "20.13.0"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-Dvnuy+2xW9hPjPVqN7X057B/1zWqIPbkS90kjexJvio="; + sha256 = "sha256-W/tFM/WpWdSvLEf0iwQoH2JVDjyfr1l8CRQkOG5q4hk="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index ecfd8a676bca..200fab274339 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , pkg-config , cmake , opencv @@ -35,6 +36,19 @@ stdenv.mkDerivation rec { hash = "sha256-1xb8O3VrErldid2OgAUMG28mSUO7QBUsPuSz8p03tSI"; }; + patches = [ + # Fix build with g2o 20230806 + (fetchpatch { + url = "https://github.com/introlab/rtabmap/commit/85cc6fe3c742855ad16c8442895e12dbb10b6e8b.patch"; + hash = "sha256-P6GkYKCNwe9dgZdgF/oEhgjA3bJnwXFWJCPoyIknQCo="; + }) + # Fix typo in previous patch + (fetchpatch { + url = "https://github.com/introlab/rtabmap/commit/c4e94bcdc31b859c1049724dbb7671e4597d86de.patch"; + hash = "sha256-1btkV4/y+bnF3xEVqlUy/9F6BoANeTOEJjZLmRzG3iA="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ]; buildInputs = [ ## Required |