From 856834e0dc75a5176fef678d998287017a4a1edd Mon Sep 17 00:00:00 2001 From: lyken Date: Mon, 3 Jun 2024 15:20:36 +0800 Subject: [PATCH 1/3] flake: add llvmPackages_14.bintools --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index ec37fdd9..03d9c8dd 100644 --- a/flake.nix +++ b/flake.nix @@ -148,6 +148,7 @@ name = "nac3-dev-shell"; buildInputs = with pkgs; [ # build dependencies + llvmPackages_14.bintools # brings in llvm-link. Used by `nac3standalone/demo/run_demo.sh --lli` packages.x86_64-linux.llvm-nac3 llvmPackages_14.clang # demo packages.x86_64-linux.llvm-tools-irrt -- 2.44.1 From 2851e1007abed6961ccad60a508959c5f549a6be Mon Sep 17 00:00:00 2001 From: lyken Date: Mon, 3 Jun 2024 17:38:33 +0800 Subject: [PATCH 2/3] flake: Reorganize buildInputs of devShells.x86_64-linux.default --- flake.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 03d9c8dd..8aa61682 100644 --- a/flake.nix +++ b/flake.nix @@ -148,9 +148,8 @@ name = "nac3-dev-shell"; buildInputs = with pkgs; [ # build dependencies - llvmPackages_14.bintools # brings in llvm-link. Used by `nac3standalone/demo/run_demo.sh --lli` packages.x86_64-linux.llvm-nac3 - llvmPackages_14.clang # demo + llvmPackages_14.clang llvmPackages_14.bintools # for running nac3standalone demos packages.x86_64-linux.llvm-tools-irrt cargo rustc -- 2.44.1 From 8ac2baed3fda7f7dde0b1cf566696c3995733a18 Mon Sep 17 00:00:00 2001 From: lyken Date: Tue, 4 Jun 2024 10:04:31 +0800 Subject: [PATCH 3/3] flake: change llvm bintools to llvm.out in devShells --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 8aa61682..fe5100f6 100644 --- a/flake.nix +++ b/flake.nix @@ -149,7 +149,7 @@ buildInputs = with pkgs; [ # build dependencies packages.x86_64-linux.llvm-nac3 - llvmPackages_14.clang llvmPackages_14.bintools # for running nac3standalone demos + llvmPackages_14.clang llvmPackages_14.llvm.out # for running nac3standalone demos packages.x86_64-linux.llvm-tools-irrt cargo rustc -- 2.44.1