about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEthan Glasser-Camp <ethan@betacantrips.com>2018-12-27 23:11:15 -0500
committerEthan Glasser-Camp <ethan@betacantrips.com>2018-12-27 23:11:15 -0500
commitff4d190763c33a212397f19644b907e34505aac2 (patch)
tree0afce743d0447a871d7d725c2fdc6dad4ea44d28
parentfcd3e318d6e90ea8ab30951431ce9a6efda42566 (diff)
downloadnixlib-ff4d190763c33a212397f19644b907e34505aac2.tar
nixlib-ff4d190763c33a212397f19644b907e34505aac2.tar.gz
nixlib-ff4d190763c33a212397f19644b907e34505aac2.tar.bz2
nixlib-ff4d190763c33a212397f19644b907e34505aac2.tar.lz
nixlib-ff4d190763c33a212397f19644b907e34505aac2.tar.xz
nixlib-ff4d190763c33a212397f19644b907e34505aac2.tar.zst
nixlib-ff4d190763c33a212397f19644b907e34505aac2.zip
nasm is now required to build Gecko
This was introduced in https://bugzilla.mozilla.org/show_bug.cgi?id=1501796.
-rw-r--r--pkgs/gecko/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/gecko/default.nix b/pkgs/gecko/default.nix
index 610a7a371340..5007832c2697 100644
--- a/pkgs/gecko/default.nix
+++ b/pkgs/gecko/default.nix
@@ -9,7 +9,7 @@
 , setuptools
 , rust # rust & cargo bundled. (otheriwse use pkgs.rust.{rustc,cargo})
 , buildFHSUserEnv # Build a FHS environment with all Gecko dependencies.
-, llvmPackages
+, llvmPackages, nasm
 , ccache
 
 , zlib, xorg
@@ -87,6 +87,9 @@ let
     # cbindgen is used to generate C bindings for WebRender.
     rust-cbindgen
 
+    # nasm is used to build libdav1d.
+    nasm
+
     # NodeJS is used for tooling around JS development.
     nodejs