diff options
| author | pmahoney <pat@polycrystal.org> | 2018-10-06 13:56:21 -0500 |
|---|---|---|
| committer | Benjamin Staffin <benley@gmail.com> | 2018-10-06 14:56:21 -0400 |
| commit | 4af5457ebb10fe2fb1c10498b0ca307cf6298d92 (patch) | |
| tree | 55f9bd778985ac29a6f7a8150aadcab9d05b1b15 /pkgs/development/compilers | |
| parent | ec7d7e1f78fd7bf4b0abd40bc87779ed36ce407f (diff) | |
| download | nixlib-4af5457ebb10fe2fb1c10498b0ca307cf6298d92.tar nixlib-4af5457ebb10fe2fb1c10498b0ca307cf6298d92.tar.gz nixlib-4af5457ebb10fe2fb1c10498b0ca307cf6298d92.tar.bz2 nixlib-4af5457ebb10fe2fb1c10498b0ca307cf6298d92.tar.lz nixlib-4af5457ebb10fe2fb1c10498b0ca307cf6298d92.tar.xz nixlib-4af5457ebb10fe2fb1c10498b0ca307cf6298d92.tar.zst nixlib-4af5457ebb10fe2fb1c10498b0ca307cf6298d92.zip | |
jsonnet: fix on darwin (#47939)
Build on darwin fails when using emscripten to build the js library. Disabling this is unsatisfying, but gets the jsonnet binary building again.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/jsonnet/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index 4a520471f867..f363c6fdb5ee 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, emscripten }: +{ stdenv, lib, fetchFromGitHub, emscripten +, enableJsonnetJs ? !stdenv.isDarwin +}: let version = "0.11.2"; in @@ -13,16 +15,17 @@ stdenv.mkDerivation { sha256 = "05rl5i4g36k2ikxv4sw726mha1qf5bb66wiqpi0s09wj9azm7vym"; }; - buildInputs = [ emscripten ]; + buildInputs = if enableJsonnetJs then [ emscripten ] else [ ]; enableParallelBuilding = true; - makeFlags = [''EM_CACHE=$(TMPDIR)/.em_cache'' ''all'']; + makeFlags = [''EM_CACHE=$(TMPDIR)/.em_cache''] ++ + (if enableJsonnetJs then ["all"] else ["jsonnet" "libjsonnet.so" "libjsonnet++.so"]); installPhase = '' mkdir -p $out/bin $out/lib $out/share/ cp jsonnet $out/bin/ - cp libjsonnet.so $out/lib/ + cp libjsonnet*.so $out/lib/ cp -a doc $out/share/doc cp -a include $out/include ''; |