From 96f1d10731e8ed411e78327a11b200fad8441e89 Mon Sep 17 00:00:00 2001 From: Sven Tennie Date: Fri, 14 Apr 2023 15:23:50 +0000 Subject: [PATCH] Add QEMU and Llvm lit --- ghc.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ghc.nix b/ghc.nix index 2850a47..8908cf3 100644 --- a/ghc.nix +++ b/ghc.nix @@ -29,6 +29,8 @@ in , withGrind ? !((pkgsFor nixpkgs system).valgrind.meta.broken or false) , withEMSDK ? false # load emscripten for js-backend , crossTarget ? null # a `nixpkgs.pkgsCross` record, e.g. `riscv64` +, withQEMU ? false +, withLlvmLit ? false # for llvm lit tests }: let @@ -124,6 +126,7 @@ let ++ optional withIde (pkgs-unstable.haskell-language-server.override { supportedGhcVersions = [ (builtins.replaceStrings [ "." ] [ "" ] ghc.version) ]; }) ++ optional withIde clang-tools # N.B. clang-tools for clangd ++ optional withDtrace linuxPackages.systemtap + ++ optional withLlvmLit lit ++ (if (! stdenv.isDarwin) then [ pxz ] else [ @@ -131,6 +134,12 @@ let darwin.libobjc darwin.apple_sdk.frameworks.Foundation ]) + ++ optional withQEMU ( + if crossTarget == null then + [ qemu ] + else + [ pkgsCross.${crossTarget}.buildPackages.buildPackages.qemu ] + ) ); happy =