wabt: 1.0.13 -> 1.0.14
https://github.com/WebAssembly/wabt/releases/tag/1.0.14
This commit is contained in:
parent
15e583c1b1
commit
19d2c0601b
@ -2,25 +2,18 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wabt";
|
pname = "wabt";
|
||||||
version = "1.0.13";
|
version = "1.0.14";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "WebAssembly";
|
owner = "WebAssembly";
|
||||||
repo = "wabt";
|
repo = "wabt";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "07x8m5sf4c7zjq1flypycw1d15ylqdp38l81vn961ds089ngvpgg";
|
sha256 = "0zis0190zs37x1wq044qd2vyvzcrkm8kp0734byz1lpdlgl5257b";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(substituteAll {
|
|
||||||
src = ./version.patch;
|
|
||||||
inherit version;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
|
cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ];
|
||||||
buildInputs = [ python3 ];
|
buildInputs = [ python3 ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
@ -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
|
|
Loading…
Reference in New Issue
Block a user