From c2a753e198376b8058628e26ec00ff2dd099bf78 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Sat, 9 Nov 2024 18:38:59 -0800 Subject: [PATCH] darwin.file_cmds: add libmd for install clang-19 defines `TARGET_OS_OSX` which results in the install build require various digests. Using libmd fixes the build. --- .../darwin/apple-source-releases/file_cmds/meson.build.in | 3 ++- .../darwin/apple-source-releases/file_cmds/package.nix | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in index 7fc7ed7d901f4..638742f978c2a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in @@ -15,6 +15,7 @@ core_foundation = dependency('appleframeworks', modules : 'CoreFoundation') bzip2 = dependency('bzip2') xz = dependency('liblzma') +libmd = dependency('libmd') libxo = dependency('libxo') zlib = dependency('zlib') @@ -173,7 +174,7 @@ install_symlink( executable( 'install-bin', # Meson reserves the name “install”, so use a different name and rename in install phase. - dependencies : [ copyfile ], + dependencies : [ copyfile, libmd ], install : true, sources: [ 'install/xinstall.c', diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix index 93b578b1c008a..584d2a312a605 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix @@ -4,6 +4,7 @@ bzip2, copyfile, less, + libmd, libutil, libxo, mkAppleDerivation, @@ -104,6 +105,7 @@ mkAppleDerivation { buildInputs = [ bzip2 copyfile + libmd libutil libxo removefile