aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/generic.nix
diff options
context:
space:
mode:
authorMx Kookie <kookie@spacekookie.de>2020-12-09 18:55:19 +0000
committerMx Kookie <kookie@spacekookie.de>2020-12-09 18:55:19 +0000
commit80d90d9b204f7c17912740f9f414fe5d59f293ba (patch)
tree5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/generic.nix
parent3a31a84c7d3e589035ad08499206aac44a81f424 (diff)
parent83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff)
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/generic.nix')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/generic.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/generic.nix
index c93d423945cb..214d64cfa76b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/generic.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/generic.nix
@@ -1,5 +1,5 @@
{ version, ldcSha256 }:
-{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata
+{ stdenv, fetchurl, cmake, ninja, llvm_11, curl, tzdata
, libconfig, lit, gdb, unzip, darwin, bash
, callPackage, makeWrapper, runCommand, targetPackages
, ldcBootstrap ? callPackage ./bootstrap.nix { }
@@ -56,16 +56,12 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
- cmake ninja makeWrapper unzip ldcBootstrap lit lit.python
+ cmake ldcBootstrap lit lit.python llvm_11 makeWrapper ninja unzip
]
++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Foundation
- # https://github.com/NixOS/nixpkgs/issues/57120
- # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515
- llvm_5
]
++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [
- llvm_8
# https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
gdb
];