diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
| commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
| tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/development/compilers/binaryen/default.nix | |
| parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
| parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
| download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip | |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/binaryen/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/binaryen/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/nixpkgs/pkgs/development/compilers/binaryen/default.nix index 664335c3dade..d37232437668 100644 --- a/nixpkgs/pkgs/development/compilers/binaryen/default.nix +++ b/nixpkgs/pkgs/development/compilers/binaryen/default.nix @@ -1,12 +1,12 @@ -{ stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }: +{ stdenv, cmake, python3, fetchFromGitHub, emscriptenRev ? null, substituteAll }: let - defaultVersion = "89"; + defaultVersion = "91"; # Map from git revs to SHA256 hashes sha256s = { - version_89 = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij"; - "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v"; + version_91 = "1qsjqnzc5w9ny9v01bxkdvhh4kgbsia01x5vvac72m075v4mpgs4"; + "1.39.1" = "0ygm9m5322h4vfpf3j63q32qxk2l26yk62hh7dkb49j51zwl1y3y"; }; in @@ -29,7 +29,12 @@ stdenv.mkDerivation rec { inherit rev; }; - nativeBuildInputs = [ cmake python ]; + patches = stdenv.lib.optional (emscriptenRev != null) (substituteAll { + src = ./0001-Get-rid-of-git-dependency.patch; + emscriptenv = "1.39.1"; + }); + + nativeBuildInputs = [ cmake python3 ]; meta = with stdenv.lib; { homepage = https://github.com/WebAssembly/binaryen; |