From 2e41a59bbb4f79def51b9540ed51058fa457fead Mon Sep 17 00:00:00 2001 From: Steven Keuchel Date: Sat, 31 Aug 2024 11:34:24 +0200 Subject: [PATCH] cdrtools: fix riscv64-linux build Also apply the fixes for aarch64-darwin unconditionall. --- pkgs/tools/cd-dvd/cdrtools/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/cd-dvd/cdrtools/default.nix b/pkgs/tools/cd-dvd/cdrtools/default.nix index 1a3e58df2cc8..053aebecaf41 100644 --- a/pkgs/tools/cd-dvd/cdrtools/default.nix +++ b/pkgs/tools/cd-dvd/cdrtools/default.nix @@ -16,10 +16,11 @@ stdenv.mkDerivation rec { sed "/\.mk3/d" -i libschily/Targets.man substituteInPlace man/Makefile --replace "man4" "" substituteInPlace RULES/rules.prg --replace "/bin/" "" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + ln -sv i386-darwin-clang64.rul RULES/arm64-darwin-cc.rul ln -sv i386-darwin-clang64.rul RULES/arm64-darwin-clang.rul ln -sv i386-darwin-clang64.rul RULES/arm64-darwin-clang64.rul + ln -sv i586-linux-cc.rul RULES/riscv64-linux-cc.rul ''; dontConfigure = true;