diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-09-16 23:09:36 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-09-17 00:34:29 +0200 |
| commit | 0fc59006657f67fa3a526da6e052e74a56ca0686 (patch) | |
| tree | ccf9f9bd970b9d9c329c9e305ae7af32e5278c0b /pkgs/development/compilers | |
| parent | 02bd1275f0455e58823896704ebc082320ac2e78 (diff) | |
| parent | 652e3488f907c23a685a07c63caf085619789860 (diff) | |
| download | nixlib-0fc59006657f67fa3a526da6e052e74a56ca0686.tar nixlib-0fc59006657f67fa3a526da6e052e74a56ca0686.tar.gz nixlib-0fc59006657f67fa3a526da6e052e74a56ca0686.tar.bz2 nixlib-0fc59006657f67fa3a526da6e052e74a56ca0686.tar.lz nixlib-0fc59006657f67fa3a526da6e052e74a56ca0686.tar.xz nixlib-0fc59006657f67fa3a526da6e052e74a56ca0686.tar.zst nixlib-0fc59006657f67fa3a526da6e052e74a56ca0686.zip | |
Merge #18585: pcre2: 10.21 -> 10.22
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" |