From a19e9c0becb7a273be721e4d826d4118b5ba7ce7 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 19 Apr 2022 10:23:31 +0800
Subject: [PATCH] flake: provide llvm-as for IRRT

clang already depends on llvmPackages_13.llvm, so, unlike the statically-linked tools
from llvm-nac3, this does not make the bloat even worse.
---
 flake.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 29216e57..2d41b4c3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,7 +23,7 @@
               };
             };
             passthru.cargoLock = cargoLock;
-            nativeBuildInputs = [ pkgs.python3 pkgs.llvmPackages_13.clang-unwrapped llvm-nac3 ];
+            nativeBuildInputs = [ pkgs.python3 pkgs.llvmPackages_13.clang-unwrapped pkgs.llvmPackages_13.llvm.out llvm-nac3 ];
             buildInputs = [ pkgs.python3 llvm-nac3 ];
             checkInputs = [ (pkgs.python3.withPackages(ps: [ ps.numpy ])) ];
             checkPhase =
@@ -65,7 +65,7 @@
             name = "nac3artiq-instrumented";
             src = self;
             inherit (nac3artiq) cargoLock;
-            nativeBuildInputs = [ pkgs.python3 pkgs.llvmPackages_13.clang-unwrapped llvm-nac3-instrumented ];
+            nativeBuildInputs = [ pkgs.python3 pkgs.llvmPackages_13.clang-unwrapped pkgs.llvmPackages_13.llvm.out llvm-nac3-instrumented ];
             buildInputs = [ pkgs.python3 llvm-nac3-instrumented ];
             cargoBuildFlags = [ "--package" "nac3artiq" "--features" "init-llvm-profile" ];
             doCheck = false;
@@ -92,7 +92,7 @@
           buildInputs = [
             (python3-mimalloc.withPackages(ps: [ ps.numpy ps.jsonschema sipyco.packages.x86_64-linux.sipyco nac3artiq-instrumented ]))
             pkgs.lld_13
-            pkgs.llvmPackages_13.libllvm
+            pkgs.llvmPackages_13.llvm.out
           ];
           phases = [ "buildPhase" "installPhase" ];
           buildPhase =
@@ -117,7 +117,7 @@
             name = "nac3artiq-pgo";
             src = self;
             inherit (nac3artiq) cargoLock;
-            nativeBuildInputs = [ pkgs.python3 pkgs.llvmPackages_13.clang-unwrapped llvm-nac3-pgo ];
+            nativeBuildInputs = [ pkgs.python3 pkgs.llvmPackages_13.clang-unwrapped pkgs.llvmPackages_13.llvm.out llvm-nac3-pgo ];
             buildInputs = [ pkgs.python3 llvm-nac3-pgo ];
             cargoBuildFlags = [ "--package" "nac3artiq" ];
             cargoTestFlags = [ "--package" "nac3ast" "--package" "nac3parser" "--package" "nac3core" "--package" "nac3artiq" ];
@@ -139,6 +139,7 @@
           # build dependencies
           packages.x86_64-linux.llvm-nac3
           llvmPackages_13.clang-unwrapped  # IRRT
+          pkgs.llvmPackages_13.llvm.out    # IRRT
           cargo
           rustc
           # runtime dependencies