From 715c5298f5367c96562b5e06e1f5a4329d01a4a8 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 13 Feb 2025 13:55:13 -0800 Subject: [PATCH] frawk: disable llvm support --- pkgs/by-name/fr/frawk/package.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/fr/frawk/package.nix b/pkgs/by-name/fr/frawk/package.nix index 6e81d990cd9c..4c5870fe2690 100644 --- a/pkgs/by-name/fr/frawk/package.nix +++ b/pkgs/by-name/fr/frawk/package.nix @@ -5,10 +5,16 @@ libxml2, ncurses, zlib, - features ? [ "default" ], - llvmPackages_12, + features ? [ + "use_jemalloc" + "allow_avx2" + "unstable" + ], }: - +# Don't allow LLVM support until https://github.com/ezrosent/frawk/issues/115 is resolved. +assert lib.assertMsg ( + !(lib.elem "default" features || lib.elem "llvm_backend" features) +) "LLVM support has been dropped due to LLVM 12 EOL."; rustPlatform.buildRustPackage rec { pname = "frawk"; version = "0.4.8"; @@ -30,13 +36,9 @@ rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = true; buildFeatures = features; - preBuild = - lib.optionalString (lib.elem "default" features || lib.elem "llvm_backend" features) '' - export LLVM_SYS_120_PREFIX=${llvmPackages_12.llvm.dev} - '' - + lib.optionalString (lib.elem "default" features || lib.elem "unstable" features) '' - export RUSTC_BOOTSTRAP=1 - ''; + preBuild = lib.optionalString (lib.elem "default" features || lib.elem "unstable" features) '' + export RUSTC_BOOTSTRAP=1 + ''; # depends on cpu instructions that may not be available on builders doCheck = false;