From 19d2c0601bfdf9aec5636c79b0ed49672c0325b3 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 5 May 2020 22:38:19 +0200
Subject: [PATCH] wabt: 1.0.13 -> 1.0.14

https://github.com/WebAssembly/wabt/releases/tag/1.0.14
---
 pkgs/development/tools/wabt/default.nix   | 13 +++--------
 pkgs/development/tools/wabt/version.patch | 28 -----------------------
 2 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/development/tools/wabt/version.patch

diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix
index 281d68d27de6..376593eefb8b 100644
--- a/pkgs/development/tools/wabt/default.nix
+++ b/pkgs/development/tools/wabt/default.nix
@@ -2,25 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "wabt";
-  version = "1.0.13";
+  version = "1.0.14";
 
   src = fetchFromGitHub {
     owner = "WebAssembly";
     repo = "wabt";
     rev = version;
-    sha256 = "07x8m5sf4c7zjq1flypycw1d15ylqdp38l81vn961ds089ngvpgg";
+    sha256 = "0zis0190zs37x1wq044qd2vyvzcrkm8kp0734byz1lpdlgl5257b";
     fetchSubmodules = true;
   };
 
-  patches = [
-    (substituteAll {
-      src = ./version.patch;
-      inherit version;
-    })
-  ];
-
   nativeBuildInputs = [ cmake ];
-  cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
+  cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ];
   buildInputs = [ python3 ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/wabt/version.patch b/pkgs/development/tools/wabt/version.patch
deleted file mode 100644
index a49cd0bc1552..000000000000
--- a/pkgs/development/tools/wabt/version.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 363a5660..ad3300ed 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -68,22 +68,7 @@ endif ()
- include(CheckTypeSize)
- check_type_size(ssize_t SSIZE_T)
- check_type_size(size_t SIZEOF_SIZE_T)
--
--FIND_PACKAGE(Git QUIET REQUIRED)
--EXECUTE_PROCESS(COMMAND
--        "${GIT_EXECUTABLE}" --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git describe --tags
--        RESULT_VARIABLE
--            GIT_HASH_RESULT
--        OUTPUT_VARIABLE
--            GIT_HASH
--        OUTPUT_STRIP_TRAILING_WHITESPACE)
--
--IF(${GIT_HASH_RESULT} EQUAL 0)
--    SET(WABT_VERSION_INFO "${GIT_HASH}")
--ELSE()
--    MESSAGE(WARNING "Error running git describe to determine version")
--    SET(WABT_VERSION_INFO "(unable to determine version)")
--ENDIF()
-+SET(WABT_VERSION_INFO "@version@")
- 
- configure_file(
-   ${WABT_SOURCE_DIR}/src/config.h.in