public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-03-28 15:16:29 +00:00
parent 3f45f0948d c61445357e
commit f60c9df0ba
628 changed files with 60034 additions and 8180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/clisp/2.44.1.nix
View File

@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
cd builddir
'';
NIX_CFLAGS_COMPILE="-O0";
NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
hardeningDisable = [ "format" ];

2
pkgs/development/interpreters/clisp/default.nix
View File

@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
clx/new-clx bindings/glibc pcre rawsock wildcard zlib
'';
NIX_CFLAGS_COMPILE="-O0";
NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
# TODO : make mod-check fails
doCheck = false;