about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorAristid Breitkreuz <aristidb@gmail.com>2016-06-18 14:29:09 +0200
committerAristid Breitkreuz <aristidb@gmail.com>2016-06-18 14:29:09 +0200
commit333a5bf42bca79c8b3d406c1c3159c3a9c484d6b (patch)
tree4207df39118947ad249294e949489ae093e0101b /pkgs/development
parentc94f4f85c57dd80e0b88c95d73b93e124cb6d324 (diff)
downloadnixlib-333a5bf42bca79c8b3d406c1c3159c3a9c484d6b.tar
nixlib-333a5bf42bca79c8b3d406c1c3159c3a9c484d6b.tar.gz
nixlib-333a5bf42bca79c8b3d406c1c3159c3a9c484d6b.tar.bz2
nixlib-333a5bf42bca79c8b3d406c1c3159c3a9c484d6b.tar.lz
nixlib-333a5bf42bca79c8b3d406c1c3159c3a9c484d6b.tar.xz
nixlib-333a5bf42bca79c8b3d406c1c3159c3a9c484d6b.tar.zst
nixlib-333a5bf42bca79c8b3d406c1c3159c3a9c484d6b.zip
J: fix build
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/interpreters/j/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index 4c064a42ebf8..7238197fd858 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
   bits = if stdenv.is64bit then "64" else "32";
 
   buildPhase = ''
+    set -e
+
     sed -i bin/jconfig -e '
         s@bits=32@bits=${bits}@g;
         s@readline=0@readline=1@;
@@ -19,20 +21,27 @@ stdenv.mkDerivation rec {
         '
     sed -i bin/build_libj -e 's@>& make.txt@ 2>\&1 | tee make.txt@'
 
+    sed -i f2.c -e 's/_isnan(\*wv)/_isnan(y)/'
+
     touch *.c *.h
     sh -o errexit bin/build_jconsole
+    [ -e j/bin/jconsole ]
     sh -o errexit bin/build_libj
+    [ -e j/bin/libj.so ]
     sh -o errexit bin/build_defs
+    [ -e defs/hostdefs.ijs ] && [ -e defs/netdefs.ijs ]
     sh -o errexit bin/build_tsdll
+    [ -x libtsdll.so ]
 
     sed -i j/bin/profile.ijs -e "
         s@userx=[.] *'.j'@userx=. '/.j'@;
         s@bin,'/profilex.ijs'@user,'/profilex.ijs'@ ;
-	/install=./ainstall=. install,'/share/j'
+        /install=./ainstall=. install,'/share/j'
         "
   '';
 
   installPhase = ''
+    ls -R
     mkdir -p "$out"
     cp -r j/bin "$out/bin"
     rm "$out/bin/profilex_template.ijs"