wabt: 1.0.12 -> 1.0.13
https://github.com/WebAssembly/wabt/releases/tag/1.0.13
This commit is contained in:
parent
281e3a3c23
commit
ac65998957
@ -1,16 +1,24 @@
|
|||||||
{ stdenv, fetchFromGitHub, cmake, python3 }:
|
{ stdenv, fetchFromGitHub, cmake, python3, substituteAll }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wabt";
|
pname = "wabt";
|
||||||
version = "1.0.12";
|
version = "1.0.13";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "WebAssembly";
|
owner = "WebAssembly";
|
||||||
repo = "wabt";
|
repo = "wabt";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1zlv3740wkqj4mn6sr84h0x6wk2lcp4pwwmqsh5yyqp1j1glbsa0";
|
sha256 = "07x8m5sf4c7zjq1flypycw1d15ylqdp38l81vn961ds089ngvpgg";
|
||||||
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(substituteAll {
|
||||||
|
src = ./version.patch;
|
||||||
|
inherit version;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
|
cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
|
||||||
buildInputs = [ python3 ];
|
buildInputs = [ python3 ];
|
||||||
|
28
pkgs/development/tools/wabt/version.patch
Normal file
28
pkgs/development/tools/wabt/version.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
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