diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-06-22 23:55:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 23:55:21 +0200 |
| commit | b607aadaac36e77ff58303d199ae4f77227e41f3 (patch) | |
| tree | 0ce5a76872bea27ed4a91b272b9972e97c5a2954 /pkgs/development/interpreters | |
| parent | 32e718341035ef748812b641d6f3e75e216b5d7f (diff) | |
| parent | 465e5fc8cd73eca36e6bc4a320fdac8bd50bb160 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/php/generic.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/interpreters/wasm3/default.nix | 33 |
2 files changed, 36 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index c139e17ff0ffc..d64349eaa9373 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -124,15 +124,15 @@ let ln -s ${extraInit} $out/lib/php.ini if test -e $out/bin/php; then - wrapProgram $out/bin/php --prefix PHP_INI_SCAN_DIR : $out/lib + wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib fi if test -e $out/bin/php-fpm; then - wrapProgram $out/bin/php-fpm --prefix PHP_INI_SCAN_DIR : $out/lib + wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib fi if test -e $out/bin/phpdbg; then - wrapProgram $out/bin/phpdbg --prefix PHP_INI_SCAN_DIR : $out/lib + wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib fi ''; }; diff --git a/pkgs/development/interpreters/wasm3/default.nix b/pkgs/development/interpreters/wasm3/default.nix new file mode 100644 index 0000000000000..b16dc78ac08e0 --- /dev/null +++ b/pkgs/development/interpreters/wasm3/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, cmake, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "wasm3"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "wasm3"; + repo = "wasm3"; + rev = "v${version}"; + sha256 = "07zzmk776j8ydyxhrnnjiscbhhmz182a62r6aix6kfk5kq2cwia2"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DBUILD_WASI=simple" + ]; + + installPhase = '' + runHook preInstal + install -Dm755 wasm3 -t $out/bin + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/wasm3/wasm3"; + description = "The fastest WebAssembly interpreter, and the most universal runtime."; + platforms = platforms.all; + maintainers = with maintainers; [ malbarbo ]; + license = licenses.mit; + }; +} |