about summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-09-15 10:32:10 +0100
committerGitHub <noreply@github.com>2017-09-15 10:32:10 +0100
commit419869269df75806f8fedc18cac4c3d49a565181 (patch)
treeb2eddf5cef4a99cc4a18424527df802ebf62e432 /pkgs/top-level/all-packages.nix
parentb86fd340f077e89c54d88e33dd294eef32acd0fd (diff)
parent2a0f1ecdc81074158ed2e33c53016cf8f3a0f227 (diff)
downloadnixlib-419869269df75806f8fedc18cac4c3d49a565181.tar
nixlib-419869269df75806f8fedc18cac4c3d49a565181.tar.gz
nixlib-419869269df75806f8fedc18cac4c3d49a565181.tar.bz2
nixlib-419869269df75806f8fedc18cac4c3d49a565181.tar.lz
nixlib-419869269df75806f8fedc18cac4c3d49a565181.tar.xz
nixlib-419869269df75806f8fedc18cac4c3d49a565181.tar.zst
nixlib-419869269df75806f8fedc18cac4c3d49a565181.zip
Merge pull request #28635 from ThomasMader/ldc
Init ldc at 1.3.0, fix bootstrap dmd build, fix dtools test, run dmd-testsuite in checkPhase and fix Foundation framework
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e6ae6cc03f4..c0e430ddac08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1704,7 +1704,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;
   };
@@ -2831,6 +2838,8 @@ with pkgs;
 
   kytea = callPackage ../tools/text/kytea { };
 
+  ldc = callPackage ../development/compilers/ldc { };
+
   lbreakout2 = callPackage ../games/lbreakout2 { };
 
   leocad = callPackage ../applications/graphics/leocad { };