From 074be2ff85c3750f9c73331dc85cf76c36a8e3b3 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 12 May 2019 09:26:37 +0200 Subject: [PATCH] ldc: Fix #61316 --- pkgs/development/compilers/ldc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 043347889c84..b3cf84fdd0f8 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ninja, llvm, llvm_8, curl, tzdata +{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata , python, libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, targetPackages , bootstrapVersion ? false @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) [ # https://github.com/NixOS/nixpkgs/issues/57120 # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 - llvm + llvm_5 ] ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [ @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (bootstrapVersion) [ - libconfig llvm + libconfig llvm_5 ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { else ""; - doCheck = !bootstrapVersion && !stdenv.isDarwin; + doCheck = !bootstrapVersion; checkPhase = stdenv.lib.optionalString doCheck '' # Build default lib test runners