summary refs log tree commit diff
path: root/pkgs/development/compilers/julia/git.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-02-09 08:42:04 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-02-09 08:42:04 +0100
commit6bea415b5e3f4ab70afcea4c646ad76d9c073c89 (patch)
tree8f5e976cd8aecc6029b4019e16f0177e0a66a093 /pkgs/development/compilers/julia/git.nix
parentb846a53d2a3cba3002a4d6fb064f579677eac52c (diff)
parent4bf9f8afc39e9d0c0629635652804b81fe3e3332 (diff)
downloadnixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar
nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.gz
nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.bz2
nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.lz
nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.xz
nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.zst
nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.zip
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/compilers/julia/git.nix')
-rw-r--r--pkgs/development/compilers/julia/git.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix
index 73f0e67baa56..9cfa8895f74a 100644
--- a/pkgs/development/compilers/julia/git.nix
+++ b/pkgs/development/compilers/julia/git.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, fetchurl
 # build tools
-, gfortran, m4, makeWrapper, patchelf, perl, which, python2
+, gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl
 # libjulia dependencies
 , libunwind, readline, utf8proc, zlib
 , llvm
@@ -72,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
@@ -86,7 +86,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