From a8a96dbaf8ae4f49491903876ddaba44be9d3a39 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Wed, 2 Dec 2020 14:23:38 +0100
Subject: [PATCH 1/2] Add forgotten `override` annotation

---
 src/libutil/archive.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libutil/archive.hh b/src/libutil/archive.hh
index fe22435ef..9e9e11b1a 100644
--- a/src/libutil/archive.hh
+++ b/src/libutil/archive.hh
@@ -82,7 +82,7 @@ struct RetrieveRegularNARSink : ParseSink
         sink(data);
     }
 
-    void createSymlink(const Path & path, const string & target)
+    void createSymlink(const Path & path, const string & target) override
     {
         regular = false;
     }

From 0d9e1af695ac238b0f8c8bc296bf01eb1430e26b Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Wed, 2 Dec 2020 14:33:20 +0100
Subject: [PATCH 2/2] Remove an `unknown pragma` gcc warning

---
 src/libexpr/lexer.l | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libexpr/lexer.l b/src/libexpr/lexer.l
index 225ab3287..7298419d9 100644
--- a/src/libexpr/lexer.l
+++ b/src/libexpr/lexer.l
@@ -12,7 +12,9 @@
 
 
 %{
+#ifdef __clang__
 #pragma clang diagnostic ignored "-Wunneeded-internal-declaration"
+#endif
 
 #include <boost/lexical_cast.hpp>