diff options
| author | Will Dietz <w@wdtz.org> | 2017-02-01 03:55:05 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2017-02-01 06:48:02 -0600 |
| commit | 19f70f03b2b2ad09987494cc5fcc261599a201ee (patch) | |
| tree | d8f8f41432f5a71db172ae97165ce3471bc24a28 /pkgs/development/compilers/julia/0.5.nix | |
| parent | dd934beb9fce6345097008c0316e18880b052129 (diff) | |
julia: fix build and execution on PaX.
Alpine and Gentoo set the same flags here, FWIW.
Diffstat (limited to 'pkgs/development/compilers/julia/0.5.nix')
| -rw-r--r-- | pkgs/development/compilers/julia/0.5.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix index 04ef7b86c483b..32d98b1ce135a 100644 --- a/pkgs/development/compilers/julia/0.5.nix +++ b/pkgs/development/compilers/julia/0.5.nix @@ -2,6 +2,7 @@ # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 , runCommand +, paxctl # libjulia dependencies , libunwind, readline, utf8proc, zlib , llvm, libffi, ncurses @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { patches = [ ./0001.1-use-system-utf8proc.patch ./0002-use-system-suitesparse.patch - ]; + ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch; postPatch = '' patchShebangs . contrib @@ -89,7 +90,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; - nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ] + ++ stdenv.lib.optional stdenv.needsPax paxctl; makeFlags = let |