diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2020-05-13 23:31:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 23:31:25 +0000 |
| commit | b2f83be34d8163f227d016612327a6cd0b8aa134 (patch) | |
| tree | 6e17d10b648080b2ef6e6dacba1b72563ae608d5 /pkgs/development/interpreters | |
| parent | 8ba41a1e14961fe43523f29b8b39acb569b70e72 (diff) | |
| parent | 20235a89f8f2539c043a1820a686d9468df82032 (diff) | |
| download | nixlib-b2f83be34d8163f227d016612327a6cd0b8aa134.tar nixlib-b2f83be34d8163f227d016612327a6cd0b8aa134.tar.gz nixlib-b2f83be34d8163f227d016612327a6cd0b8aa134.tar.bz2 nixlib-b2f83be34d8163f227d016612327a6cd0b8aa134.tar.lz nixlib-b2f83be34d8163f227d016612327a6cd0b8aa134.tar.xz nixlib-b2f83be34d8163f227d016612327a6cd0b8aa134.tar.zst nixlib-b2f83be34d8163f227d016612327a6cd0b8aa134.zip | |
Merge pull request #87546 from FireyFly/pkgs/j/avx-flag
j: add avxSupport option
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/j/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index c3d5221d42a7..8e6b434281eb 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, readline, libedit, bc }: +{ stdenv, fetchFromGitHub, readline, libedit, bc +, avxSupport ? false +}: stdenv.mkDerivation rec { pname = "j"; @@ -19,6 +21,9 @@ stdenv.mkDerivation rec { if stdenv.isLinux then "linux" else if stdenv.isDarwin then "darwin" else "unknown"; + variant = if stdenv.isx86_64 && avxSupport then "avx" else ""; + + j64x="j${bits}${variant}"; doCheck = true; @@ -34,7 +39,7 @@ stdenv.mkDerivation rec { patchShebangs . sed -i $JLIB/bin/profile.ijs -e "s@'/usr/share/j/.*'@'$out/share/j'@;" - ./build_all.sh + j64x="${j64x}" ./build_all.sh cp $SOURCE_DIR/bin/${platform}/j${bits}*/* "$JLIB/bin" ''; |