From 5785a37cc1d84d1dbf3a289daafc61e856cdb0a8 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Mon, 1 Aug 2022 18:20:52 +0200 Subject: [PATCH 1/3] wizer: init at 1.4.0 --- pkgs/development/tools/wizer/default.nix | 31 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/wizer/default.nix diff --git a/pkgs/development/tools/wizer/default.nix b/pkgs/development/tools/wizer/default.nix new file mode 100644 index 000000000000..d56366cf3a8c --- /dev/null +++ b/pkgs/development/tools/wizer/default.nix @@ -0,0 +1,31 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "wizer"; + version = "1.4.0"; + + src = fetchCrate { + inherit pname version; + + sha256 = "sha256-3Hc3KKqtbZtvD+3lb/W7+AyrwPukJyxpUe94KGQlzBI="; + }; + + cargoSha256 = "sha256-zv36/W7dNpIupYn8TS+NaF7uX+BVjrI6AW6Hrlqr8Xg="; + + cargoBuildFlags = [ "--bin" pname ]; + + buildFeatures = [ "env_logger" "structopt" ]; + + # Setting $HOME to a temporary directory is necessary to prevent checks from failing, as + # the test suite creates a cache directory at $HOME/Library/Caches/BytecodeAlliance.wasmtime. + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { + description = "The WebAssembly pre-initializer"; + homepage = "https://github.com/bytecodealliance/wizer"; + license = licenses.asl20; + maintainers = with maintainers; [ lucperkins ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d5e966accc3..adf83a12cd8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35751,6 +35751,8 @@ with pkgs; with-shell = callPackage ../applications/misc/with-shell { }; + wizer = darwin.apple_sdk_11_0.callPackage ../development/tools/wizer {}; + wmutils-core = callPackage ../tools/X11/wmutils-core { }; wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { }; From 9765a3f6415b0558cb1520412d6c0e9ec29ebbda Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Tue, 2 Aug 2022 04:24:26 +0200 Subject: [PATCH 2/3] Update pkgs/development/tools/wizer/default.nix Co-authored-by: Winter --- pkgs/development/tools/wizer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/wizer/default.nix b/pkgs/development/tools/wizer/default.nix index d56366cf3a8c..402cef7592cb 100644 --- a/pkgs/development/tools/wizer/default.nix +++ b/pkgs/development/tools/wizer/default.nix @@ -27,5 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/bytecodealliance/wizer"; license = licenses.asl20; maintainers = with maintainers; [ lucperkins ]; + broken = stdenv.isx86_64 && stdenv.isDarwin; }; } From 2dc5ed7cdd7d7ac12c9c06d4ab5839b6392c7d28 Mon Sep 17 00:00:00 2001 From: Winter Date: Mon, 1 Aug 2022 22:36:18 -0400 Subject: [PATCH 3/3] Update pkgs/development/tools/wizer/default.nix --- pkgs/development/tools/wizer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/wizer/default.nix b/pkgs/development/tools/wizer/default.nix index 402cef7592cb..f79c96f54518 100644 --- a/pkgs/development/tools/wizer/default.nix +++ b/pkgs/development/tools/wizer/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchCrate }: +{ lib, stdenv, rustPlatform, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "wizer";