From c1b30f6e6227d3ef26480e716751c75c9572e2b7 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 2 Aug 2025 14:40:17 -0400 Subject: dub 1.40.0, llvm 20 --- nix-overlays/ldc/package.nix | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'nix-overlays/ldc/package.nix') diff --git a/nix-overlays/ldc/package.nix b/nix-overlays/ldc/package.nix index ff2089b..1767785 100644 --- a/nix-overlays/ldc/package.nix +++ b/nix-overlays/ldc/package.nix @@ -2,20 +2,21 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, + callPackage, + makeWrapper, + removeReferencesTo, + runCommand, + writeText, + targetPackages, cmake, ninja, - llvm_19, + llvm_20, curl, tzdata, lit, gdb, unzip, - darwin, - callPackage, - makeWrapper, - runCommand, - writeText, - targetPackages, ldcBootstrap ? callPackage ./bootstrap.nix { }, }: @@ -63,9 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ - cmake ldcBootstrap lit lit.python llvm_19.dev makeWrapper ninja unzip - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation + cmake ldcBootstrap lit lit.python llvm_20.dev makeWrapper ninja unzip ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 gdb @@ -135,6 +134,12 @@ stdenv.mkDerivation (finalAttrs: { --set-default CC ${targetPackages.stdenv.cc}/bin/cc ''; + preFixup = '' + find $out/bin -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${ldcBootstrap} '{}' + + ''; + + disallowedReferences = [ ldcBootstrap ]; + meta = with lib; { description = "LLVM-based D compiler"; homepage = "https://github.com/ldc-developers/ldc"; -- cgit v1.2.3