dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

julia: pcre2 -> pcre2.dev + pcre2 output fix

Browse Source
This commit is contained in:
Ram Kromberg 2016-09-14 19:34:56 +03:00
parent 46046850e6
commit 652e3488f9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/julia/default.nix
View File

@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
arpack fftw fftwSinglePrec gmp libgit2 libunwind llvmShared mpfr arpack fftw fftwSinglePrec gmp libgit2 libunwind llvmShared mpfr
pcre2 openblas openlibm openspecfun readline suitesparse utf8proc pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
zlib zlib
] ++ ] ++
stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ;
@ -121,6 +121,8 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_OPENSPECFUN=1" "USE_SYSTEM_OPENSPECFUN=1"
"USE_SYSTEM_PATCHELF=1" "USE_SYSTEM_PATCHELF=1"
"USE_SYSTEM_PCRE=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_READLINE=1"
"USE_SYSTEM_UTF8PROC=1" "USE_SYSTEM_UTF8PROC=1"
"USE_SYSTEM_ZLIB=1" "USE_SYSTEM_ZLIB=1"

4
pkgs/development/compilers/julia/git.nix
View File

@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
pcre2 openblas openlibm openspecfun readline suitesparse utf8proc pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
zlib zlib
]; ];
@ -131,6 +131,8 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_OPENSPECFUN=1" "USE_SYSTEM_OPENSPECFUN=1"
"USE_SYSTEM_PATCHELF=1" "USE_SYSTEM_PATCHELF=1"
"USE_SYSTEM_PCRE=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_READLINE=1"
"USE_SYSTEM_UTF8PROC=1" "USE_SYSTEM_UTF8PROC=1"
"USE_SYSTEM_ZLIB=1" "USE_SYSTEM_ZLIB=1"