From 06049f1b3608c1040e1d072de99058c7df917367 Mon Sep 17 00:00:00 2001 From: materus Date: Sat, 14 Oct 2023 19:13:02 +0200 Subject: [PATCH] dmd: Build druntime, fix import path --- pkgs/development/compilers/dmd/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/dmd/generic.nix b/pkgs/development/compilers/dmd/generic.nix index d2679c184da7..fb79aa77420d 100644 --- a/pkgs/development/compilers/dmd/generic.nix +++ b/pkgs/development/compilers/dmd/generic.nix @@ -155,6 +155,7 @@ stdenv.mkDerivation rec { fi ${dmd_bin}/rdmd dmd/compiler/src/build.d -j$buildJobs HOST_DMD=${dmd_bin}/dmd $buildFlags + make -C dmd/druntime -f posix.mak DMD=${pathToDmd} $buildFlags -j$buildJobs echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile echo ${lib.getLib curl}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > LibcurlPathFile make -C phobos -f posix.mak $buildFlags -j$buildJobs DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" @@ -195,7 +196,7 @@ stdenv.mkDerivation rec { installManPage dmd/docs/man/man*/* mkdir -p $out/include/dmd - cp -r {druntime/import/*,phobos/{std,etc}} $out/include/dmd/ + cp -r {dmd/druntime/import/*,phobos/{std,etc}} $out/include/dmd/ mkdir $out/lib cp phobos/generated/${osname}/release/${bits}/libphobos2.* $out/lib/