From e17fdb9607d52e5d64fe0ed8a517fd2723b7d85f Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 27 Aug 2017 19:03:07 +0200 Subject: [PATCH] dmd: Fix bootstrap dmd compiler build. Doesn't work with gcc6. --- pkgs/top-level/all-packages.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 605baef6894..885faf457fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1673,7 +1673,14 @@ with pkgs; disper = callPackage ../tools/misc/disper { }; - dmd_2_067_1 = callPackage ../development/compilers/dmd/2.067.1.nix { }; + dmd_2_067_1 = callPackage ../development/compilers/dmd/2.067.1.nix { + stdenv = if stdenv.hostPlatform.isDarwin then + stdenv + else + # Doesn't build with gcc6 on linux + overrideCC stdenv gcc5; + }; + dmd = callPackage ../development/compilers/dmd { bootstrapDmd = dmd_2_067_1; };