diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-11 16:02:02 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-11 16:02:38 +0100 |
commit | dd53c65dccb6f3e45262909cd2d4548014214f12 (patch) | |
tree | 52a0937d1bbd6d0bb273b1b172085328aabab924 /pkgs/applications | |
parent | 2af1cb3aa673102491ffd8cfdeca8ae2dec154b5 (diff) | |
parent | 4f5d48abf5c4e39da8636b18db1cc9bfebd14d68 (diff) | |
download | nixlib-dd53c65dccb6f3e45262909cd2d4548014214f12.tar nixlib-dd53c65dccb6f3e45262909cd2d4548014214f12.tar.gz nixlib-dd53c65dccb6f3e45262909cd2d4548014214f12.tar.bz2 nixlib-dd53c65dccb6f3e45262909cd2d4548014214f12.tar.lz nixlib-dd53c65dccb6f3e45262909cd2d4548014214f12.tar.xz nixlib-dd53c65dccb6f3e45262909cd2d4548014214f12.tar.zst nixlib-dd53c65dccb6f3e45262909cd2d4548014214f12.zip |
Merge remote-tracking branch 'origin/gcc-5' into staging
Still some breakage but no blockers: http://hydra.nixos.org/eval/1242130?filter=x86_64-linux&compare=1237852&full=#tabs-now-fail
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/mailreaders/thunderbird/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/version-management/rcs/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 093e7a22b921..ce1335aaff24 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { "--enable-optimize" "--enable-strip" ]) ++ [ "--disable-javaxpcom" - "--enable-stdcxx-compat" # Avoid dependency on libstdc++ 4.7 + #"--enable-stdcxx-compat" # Avoid dependency on libstdc++ 4.7 ] ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; in '' diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index a829af8aa235..44f72c3f0fe7 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-std=gnu99" else null; + NIX_CFLAGS_COMPILE = [ "-std=c99" ]; meta = { homepage = http://www.gnu.org/software/rcs/; |