diff options
author | Marius Bakke <marius@gnu.org> | 2022-09-29 07:26:37 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2022-09-29 07:26:37 +0200 |
commit | f66067febc111d03929c95c067f0b88a8f8abb7b (patch) | |
tree | d571997c6756f60a9e9ddd6396e46d05ca7e0dde /gnu/local.mk | |
parent | 5dc5d6fa8136f067c85295d88018a7cd8b7cfe40 (diff) | |
parent | 45eac6cdf5c8d9d7b0c564b105c790d2d2007799 (diff) | |
download | guix-f66067febc111d03929c95c067f0b88a8f8abb7b.tar guix-f66067febc111d03929c95c067f0b88a8f8abb7b.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 78bdc113ac..3ba6e55792 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -997,6 +997,7 @@ dist_patch_DATA = \ %D%/packages/patches/cpuinfo-system-libraries.patch \ %D%/packages/patches/cpulimit-with-glib-2.32.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \ + %D%/packages/patches/crc32c-unbundle-googletest.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \ %D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/cube-nocheck.patch \ @@ -1868,6 +1869,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/tensorflow-c-api-fix.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ + %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ @@ -1967,6 +1969,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ |