diff options
| author | Ram Kromberg <ramkromberg@mail.com> | 2016-09-14 19:34:56 +0300 |
|---|---|---|
| committer | Ram Kromberg <ramkromberg@mail.com> | 2016-09-14 21:35:44 +0300 |
| commit | 652e3488f907c23a685a07c63caf085619789860 (patch) | |
| tree | 79947a6fce820404fccbae7495a5a1dd521638fd /pkgs/development/compilers | |
| parent | 46046850e65c2a5e8511c8498b2a8902a7d88b46 (diff) | |
| download | nixlib-652e3488f907c23a685a07c63caf085619789860.tar nixlib-652e3488f907c23a685a07c63caf085619789860.tar.gz nixlib-652e3488f907c23a685a07c63caf085619789860.tar.bz2 nixlib-652e3488f907c23a685a07c63caf085619789860.tar.lz nixlib-652e3488f907c23a685a07c63caf085619789860.tar.xz nixlib-652e3488f907c23a685a07c63caf085619789860.tar.zst nixlib-652e3488f907c23a685a07c63caf085619789860.zip | |
julia: pcre2 -> pcre2.dev + pcre2 output fix
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/julia/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/julia/git.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 9d0b506efeea..335de9b50cde 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack fftw fftwSinglePrec gmp libgit2 libunwind llvmShared mpfr - pcre2 openblas openlibm openspecfun readline suitesparse utf8proc + pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; @@ -121,6 +121,8 @@ stdenv.mkDerivation rec { "USE_SYSTEM_OPENSPECFUN=1" "USE_SYSTEM_PATCHELF=1" "USE_SYSTEM_PCRE=1" + "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" + "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" "USE_SYSTEM_READLINE=1" "USE_SYSTEM_UTF8PROC=1" "USE_SYSTEM_ZLIB=1" diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index 09b79c59e7d2..ed23bcb73ccd 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr - pcre2 openblas openlibm openspecfun readline suitesparse utf8proc + pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc zlib ]; @@ -131,6 +131,8 @@ stdenv.mkDerivation rec { "USE_SYSTEM_OPENSPECFUN=1" "USE_SYSTEM_PATCHELF=1" "USE_SYSTEM_PCRE=1" + "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" + "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" "USE_SYSTEM_READLINE=1" "USE_SYSTEM_UTF8PROC=1" "USE_SYSTEM_ZLIB=1" |