forked from mirrors/nixpkgs
* Urgh. Get ATerm 2.4.2-fixes to build with the -fno-strict-aliasing
flag. Note that ATerm 2.5 causes Nix to segfault, and ATerm 2.8 doesn't even build on x86_64-linux (see http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=1042). svn path=/nixpkgs/branches/stdenv-updates/; revision=19020
This commit is contained in:
parent
193f70d887
commit
06d295f51b
|
@ -13,6 +13,12 @@ stdenv.mkDerivation {
|
|||
./max-long.patch
|
||||
];
|
||||
|
||||
# There are apparently still some aliasing bugs left in
|
||||
# aterm-2.4.2-fixes-r2 (in AT_setAnnotations to be precise), but
|
||||
# under my reading of the C standard it should be fine. Anyway, just
|
||||
# disable strict aliasing.
|
||||
NIX_CFLAGS_COMPILE = "-fno-strict-aliasing";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -8499,7 +8499,7 @@ let
|
|||
|
||||
nix = makeOverridable (import ../tools/package-management/nix) {
|
||||
inherit fetchurl stdenv perl curl bzip2 openssl;
|
||||
aterm = aterm25;
|
||||
aterm = aterm242fixes;
|
||||
db4 = db45;
|
||||
supportOldDBs = getPkgConfig "nix" "OldDBSupport" true;
|
||||
storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
|
||||
|
@ -8509,7 +8509,7 @@ let
|
|||
# The bleeding edge.
|
||||
nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
|
||||
inherit fetchurl stdenv perl curl bzip2 openssl;
|
||||
aterm = aterm25;
|
||||
aterm = aterm242fixes;
|
||||
storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
|
||||
stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue