diff --git a/archivers/nevada-toolset/files/patch-CMakeLists.txt b/archivers/nevada-toolset/files/patch-CMakeLists.txt
index b8e8ecd2408b..ed450e75881a 100644
--- a/archivers/nevada-toolset/files/patch-CMakeLists.txt
+++ b/archivers/nevada-toolset/files/patch-CMakeLists.txt
@@ -1,13 +1,19 @@
 --- CMakeLists.txt.orig	2020-08-15 22:06:32 UTC
 +++ CMakeLists.txt
-@@ -15,10 +15,6 @@ option(BUILD_GUI_TOOLS "Build GUI versions of tools wh
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1.0)
++cmake_minimum_required(VERSION 3.1.0...9.9.9)
  
- option(BUILD_GUI_TOOLS "Build GUI versions of tools where available (Requires wxWidgets)." OFF)
+ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+     message(STATUS "No build type selected, default to Debug")
+@@ -14,10 +14,6 @@ else()
+ endif()
  
+ option(BUILD_GUI_TOOLS "Build GUI versions of tools where available (Requires wxWidgets)." OFF)
+-
 -if(USE_ICU)
 -    find_package(ICU REQUIRED data i18n io tu uc)
 -endif()
--
+ 
  if(BUILD_GUI_TOOLS)
      find_package(wxWidgets REQUIRED core base xrc xml adv)
- endif()
diff --git a/archivers/nevada-toolset/files/patch-libs_baseconfig_CMakeLists.txt b/archivers/nevada-toolset/files/patch-libs_baseconfig_CMakeLists.txt
index 6f1d10e4bbc0..fac0081ce1b5 100644
--- a/archivers/nevada-toolset/files/patch-libs_baseconfig_CMakeLists.txt
+++ b/archivers/nevada-toolset/files/patch-libs_baseconfig_CMakeLists.txt
@@ -1,36 +1,42 @@
 --- libs/baseconfig/CMakeLists.txt.orig	2020-01-23 13:00:42 UTC
 +++ libs/baseconfig/CMakeLists.txt
-@@ -18,7 +18,7 @@ find_package(Git)
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1.0)
++cmake_minimum_required(VERSION 3.1.0...9.9.9)
+ 
+ if(POLICY CMP0074)
+   cmake_policy(SET CMP0074 NEW)
+@@ -18,7 +18,7 @@ include(CheckIncludeFile)
  # Locate git binary to provide information to the build environment
  find_package(Git)
  
 -if(GIT_FOUND)
 +if(GIT_FOUND AND FALSE)
      # Define current git branch.
      if(NOT GITINFO_BRANCH)
          execute_process(
-@@ -90,15 +90,15 @@ else()
+@@ -90,15 +90,15 @@ if(GIT_FOUND)
      list(GET GITINFO_DATE_AND_TIME 2 GITINFO_COMMIT_TZONE)
  else()
      # Fallback information if git isn't found. This should never be present in official builds.
 -    set(GITINFO_BRANCH "netherrealm")
 -    set(GITINFO_COMMIT_SHA1 "DEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF")
 -    set(GITINFO_COMMIT_SHA1_SHORT "DEADBEEF")
 -    set(GITINFO_COMMIT_COUNT 0)
 -    set(GITINFO_COMMIT_TSTAMP 0)
 -    set(GITINFO_COMMIT_DATE "1955-11-12")
 -    set(GITINFO_COMMIT_TIME "22:04:00")
 -    set(GITINFO_COMMIT_TZONE "+0000")
 -    set(GITINFO_COMMIT_AUTHOR "Someone")
 +    set(GITINFO_BRANCH "master")
 +    set(GITINFO_COMMIT_SHA1 "d1ef34144e8b58046e43bd33b82e146aa53e65cb")
 +    set(GITINFO_COMMIT_SHA1_SHORT "d1ef341")
 +    set(GITINFO_COMMIT_COUNT 28)
 +    set(GITINFO_COMMIT_TSTAMP 1597529192)
 +    set(GITINFO_COMMIT_DATE "2020-08-15")
 +    set(GITINFO_COMMIT_TIME "23:06:32")
 +    set(GITINFO_COMMIT_TZONE "+0100")
 +    set(GITINFO_COMMIT_AUTHOR "OmniBlade")
  endif()
  
  # Set default version info for the git version module.
diff --git a/archivers/nevada-toolset/files/patch-libs_captainslog_CMakeLists.txt b/archivers/nevada-toolset/files/patch-libs_captainslog_CMakeLists.txt
index e48d95378c78..5e3c00f61765 100644
--- a/archivers/nevada-toolset/files/patch-libs_captainslog_CMakeLists.txt
+++ b/archivers/nevada-toolset/files/patch-libs_captainslog_CMakeLists.txt
@@ -1,16 +1,22 @@
 --- libs/captainslog/CMakeLists.txt.orig	2020-02-14 15:15:30 UTC
 +++ libs/captainslog/CMakeLists.txt
-@@ -31,13 +31,6 @@ elseif("${CMAKE_SYSTEM}" MATCHES "Darwin")
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1.0)
++cmake_minimum_required(VERSION 3.1.0...9.9.9)
+ 
+ if(POLICY CMP0074)
+   cmake_policy(SET CMP0074 NEW)
+@@ -31,13 +31,6 @@ if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
      list(APPEND CAPTN_SRC src/captnmessage_win32.c)
  elseif("${CMAKE_SYSTEM}" MATCHES "Darwin")
      list(APPEND CAPTN_SRC src/captnmessage_macos.m)
 -else()
 -    # TODO make a null version so builds can be done without any dependencies.
 -    find_package(GTK3 REQUIRED gtk)
 -    if(GTK3_FOUND)
 -        message("Building GTK3 version.")
 -        list(APPEND CAPTN_SRC src/captnmessage_gtk.c)
 -    endif()
  endif()
  
  add_library(captnlog STATIC ${CAPTN_SRC} src/captainslog.h)