diff --git a/srcpkgs/renderdoc/patches/atomic.patch b/srcpkgs/renderdoc/patches/atomic.patch
index ce74d2a301..1935b1e4d7 100644
--- a/srcpkgs/renderdoc/patches/atomic.patch
+++ b/srcpkgs/renderdoc/patches/atomic.patch
@@ -3,12 +3,14 @@ so we can use libatomic on targets without atomic8 support
 
 --- a/renderdoc/CMakeLists.txt
 +++ b/renderdoc/CMakeLists.txt
-@@ -55,6 +55,8 @@ elseif(UNIX)
+@@ -55,6 +55,10 @@ elseif(UNIX)
          PRIVATE -ldl
          PRIVATE -lrt)
  
-+#libatomic list(APPEND RDOC_LIBRARIES PRIVATE -latomic)
-+
++option(NEED_LIBATOMIC "need libatomic" OFF) 
++if (NEED_LIBATOMIC)
++list(APPEND RDOC_LIBRARIES PRIVATE -latomic)
++endif()
      if(ENABLE_XLIB)
          find_package(X11 REQUIRED)
  
diff --git a/srcpkgs/renderdoc/patches/c++14-needed.patch b/srcpkgs/renderdoc/patches/c++14-needed.patch
new file mode 100644
index 0000000000..5899f555a9
--- /dev/null
+++ b/srcpkgs/renderdoc/patches/c++14-needed.patch
@@ -0,0 +1,13 @@
+Index: renderdoc-1.12/CMakeLists.txt
+===================================================================
+--- renderdoc-1.12.orig/CMakeLists.txt
++++ renderdoc-1.12/CMakeLists.txt
+@@ -323,7 +323,7 @@ if(cmake_build_type_lower STREQUAL "rele
+ endif()
+ 
+ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fno-strict-aliasing")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
+     if(ENABLE_GGP)
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gline-tables-only -fno-omit-frame-pointer")
diff --git a/srcpkgs/renderdoc/template b/srcpkgs/renderdoc/template
index 9e66938c9b..59d1061c86 100644
--- a/srcpkgs/renderdoc/template
+++ b/srcpkgs/renderdoc/template
@@ -25,15 +25,11 @@ fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
+	configure_args+=" -DNEED_LIBATOMIC=ON"
 fi
 
 nocross="Cross-compilation can't find python3 interpreter"
 
-post_patch() {
-	[ -z "$XBPS_TARGET_NO_ATOMIC8" ] && return 0
-	vsed -i 's,#libatomic ,    ,' renderdoc/CMakeLists.txt
-}
-
 post_install() {
 	vlicense LICENSE.md
 	vlicense docs/credits_acknowledgements.rst