diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2012-12-09 20:06:34 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2012-12-09 20:06:34 +0400 |
| commit | 28d178521d9e2cfb50b1ebfcfed6a666f0bad28d (patch) | |
| tree | 4e1c295d654d84260445f9cacd9c7c894cb0587e /pkgs/development/compilers | |
| parent | 47f08156550d8d156de01e5238a08350f7371658 (diff) | |
| download | nixlib-28d178521d9e2cfb50b1ebfcfed6a666f0bad28d.tar nixlib-28d178521d9e2cfb50b1ebfcfed6a666f0bad28d.tar.gz nixlib-28d178521d9e2cfb50b1ebfcfed6a666f0bad28d.tar.bz2 nixlib-28d178521d9e2cfb50b1ebfcfed6a666f0bad28d.tar.lz nixlib-28d178521d9e2cfb50b1ebfcfed6a666f0bad28d.tar.xz nixlib-28d178521d9e2cfb50b1ebfcfed6a666f0bad28d.tar.zst nixlib-28d178521d9e2cfb50b1ebfcfed6a666f0bad28d.zip | |
Fix installation of Tk wrapper
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/julia/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 92663a706356..a4503911b92c 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -60,13 +60,13 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "5e984360db6ab528938b470d31352f2c3999c681"; - sha256 = "1kpywih2zz5nfih3byhdqfh09jqb68llq1dsbwkdwmvqv34dd67k"; + rev = "27b950f62aeb3664ab76e5d827b30b4885a9efb9"; + sha256 = "0khx8ln2zq3vpj0g66hnsdhw04hxl79fq43rc06ggsmc1j4xrifb"; }; buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf - openblas liblapack tcl tk xproto libX11 + openblas liblapack tcl tk xproto libX11 ]; configurePhase = '' @@ -108,9 +108,11 @@ stdenv.mkDerivation rec { ln -s libuv.a usr/lib/uv.a ''; - postInstall = '' - make -C deps install-tk-wrapper + preInstall = '' + make -C deps install-tk-wrapper + ''; + postInstall = '' ( cd $out/share/julia/test/ $out/bin/julia runtests.jl all |