diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/compilers/ldc')
3 files changed, 6 insertions, 10 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/binary.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/binary.nix index 56d40be86194..cbdb56efb17f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/binary.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/binary.nix @@ -17,7 +17,8 @@ in mkDerivation { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook ] + ++ lib.optional hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxml2 stdenv.cc.cc ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/default.nix index 5a4baabcf8d8..e0a689c7fa05 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/default.nix @@ -1,5 +1,4 @@ import ./generic.nix { - version = "1.20.1"; - ldcSha256 = "1bqsgab22v02pc3c9gcyf15y7aimadv24d68icaw5lpgnvzxy89b"; + version = "1.24.0"; + ldcSha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx"; } - 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 ]; |