Taken from upstream: https://github.com/sigrokproject/pulseview/pull/39/commits/fb89dd11f2a4a08b73c498869789e38677181a8d. From fb89dd11f2a4a08b73c498869789e38677181a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Wed, 28 Apr 2021 02:14:47 +0200 Subject: [PATCH] Fix broken build due to C++ template behind C linkage glib/gatomic.h since 2.68 includes type_traits, which causes a compilation error: In file included from /usr/include/glib-2.0/glib/gatomic.h:31, from /usr/include/glib-2.0/glib/gthread.h:32, from /usr/include/glib-2.0/glib/gasyncqueue.h:32, from /usr/include/glib-2.0/glib.h:32, from /usr/include/libsigrokdecode/libsigrokdecode.h:25, from /home/abuild/rpmbuild/BUILD/pulseview-0.4.2/pv/data/decode/annotation.cpp:21: /usr/include/c++/10/type_traits:2308:3: error: template with C linkage 2308 | template As libsigrokdecode.h declares extern C linkage itself where necessary, remove it from pulseviews include statements from the last two occasions. --- pv/data/decode/annotation.cpp | 2 -- pv/views/trace/decodetrace.cpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp index 7f233478..f8a5c47b 100644 --- a/pv/data/decode/annotation.cpp +++ b/pv/data/decode/annotation.cpp @@ -17,9 +17,7 @@ * along with this program; if not, see . */ -extern "C" { #include -} #include #include diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp index 409f1d28..888064d0 100644 --- a/pv/views/trace/decodetrace.cpp +++ b/pv/views/trace/decodetrace.cpp @@ -17,9 +17,7 @@ * along with this program; if not, see . */ -extern "C" { #include -} #include #include >path: root/gnu/services/nix.scm
AgeCommit message (Expand)Author
2024-06-02services: nix: Fix activation....This commit follows 797be0ea5c3703ad96acd32c98dca5f946cf5c95. Reported by kiasoc5 <kiasoc5@disroot.org> at <https://lists.gnu.org/archive/html/help-guix/2024-05/msg00185.html>. * gnu/services/nix.scm (nix-activation): Avoid provisioning the store if it already exists. Change-Id: I159e8af5d7bd6ce62857b356d6e9ac68fe16acf4 Oleg Pykhalov
2024-05-29services: nix: Mount Nix store read only....* gnu/services/nix.scm (nix-shepherd-service): Add requirements. (%nix-store-directory): New variable. (nix-service-type): Add file-system-service-type extension. Change-Id: I18a5d58c92c1f2b5b6dcecc3d5b439cc15bf4e49 Oleg Pykhalov
2022-12-15services: nix: Fix nix-shepherd-service....* gnu/services/nix.scm (nix-shepherd-service): Un-gexp build-directory. Christopher Baines
2022-12-13services: nix: Add more configuration fields....* gnu/services/nix.scm (<nix-configuration>)[build-directory]: New field. (nix-service-etc, nix-shepherd-service): Take them into account. * doc/guix.texi (Nix): Update it. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Petr Hodina