diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-17 23:15:16 +0100 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-17 23:58:02 +0100 |
| commit | ac65998957255aa4b67f771e9889534dcfe2298d (patch) | |
| tree | 366f5667f79c91712697eb52cb9f6e810d3d56af | |
| parent | 281e3a3c2360d1058769b8eaa286eb16a3f94f56 (diff) | |
| download | nixpkgs-ac65998957255aa4b67f771e9889534dcfe2298d.tar nixpkgs-ac65998957255aa4b67f771e9889534dcfe2298d.tar.gz nixpkgs-ac65998957255aa4b67f771e9889534dcfe2298d.tar.bz2 nixpkgs-ac65998957255aa4b67f771e9889534dcfe2298d.tar.lz nixpkgs-ac65998957255aa4b67f771e9889534dcfe2298d.tar.xz nixpkgs-ac65998957255aa4b67f771e9889534dcfe2298d.tar.zst nixpkgs-ac65998957255aa4b67f771e9889534dcfe2298d.zip | |
wabt: 1.0.12 -> 1.0.13
https://github.com/WebAssembly/wabt/releases/tag/1.0.13
| -rw-r--r-- | pkgs/development/tools/wabt/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/development/tools/wabt/version.patch | 28 |
2 files changed, 42 insertions, 6 deletions
diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 4c7df9b12d8..b3be6c4552d 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchFromGitHub, cmake, python3 }: +{ stdenv, fetchFromGitHub, cmake, python3, substituteAll }: stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.12"; + version = "1.0.13"; src = fetchFromGitHub { - owner = "WebAssembly"; - repo = "wabt"; - rev = version; - sha256 = "1zlv3740wkqj4mn6sr84h0x6wk2lcp4pwwmqsh5yyqp1j1glbsa0"; + owner = "WebAssembly"; + repo = "wabt"; + rev = version; + sha256 = "07x8m5sf4c7zjq1flypycw1d15ylqdp38l81vn961ds089ngvpgg"; + fetchSubmodules = true; }; + patches = [ + (substituteAll { + src = ./version.patch; + inherit version; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; buildInputs = [ python3 ]; diff --git a/pkgs/development/tools/wabt/version.patch b/pkgs/development/tools/wabt/version.patch new file mode 100644 index 00000000000..a49cd0bc155 --- /dev/null +++ b/pkgs/development/tools/wabt/version.patch @@ -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 |