diff options
Diffstat (limited to 'users')
-rw-r--r-- | users/grfn/achilles/default.nix | 12 | ||||
-rw-r--r-- | users/grfn/system/home/modules/development.nix | 2 | ||||
-rw-r--r-- | users/tazjin/nixos/frog/default.nix | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/users/grfn/achilles/default.nix b/users/grfn/achilles/default.nix index 4ad71455d444..5245049d4a32 100644 --- a/users/grfn/achilles/default.nix +++ b/users/grfn/achilles/default.nix @@ -1,20 +1,24 @@ { depot, pkgs, ... }: +let + llvmPackages = pkgs.llvmPackages_11; +in + depot.third_party.naersk.buildPackage { src = ./.; - buildInputs = with pkgs; [ - clang_11 + buildInputs = [ + llvmPackages.clang llvmPackages.llvm llvmPackages.bintools - llvmPackages.clang llvmPackages.libclang.lib + ] ++ (with pkgs; [ zlib ncurses libxml2 libffi pkgconfig - ]; + ]); doCheck = true; } diff --git a/users/grfn/system/home/modules/development.nix b/users/grfn/system/home/modules/development.nix index 932c03d40885..43bb7a79a21d 100644 --- a/users/grfn/system/home/modules/development.nix +++ b/users/grfn/system/home/modules/development.nix @@ -55,7 +55,7 @@ with lib; gdb lldb hyperfine - clang-tools + clang-tools_11 (rr.overrideAttrs (_: rec { version = "f25671d094edac8059cec56b98d7f10f2c740697"; src = pkgs.fetchFromGitHub { diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix index 3b0cac643ec7..325483aafbfe 100644 --- a/users/tazjin/nixos/frog/default.nix +++ b/users/tazjin/nixos/frog/default.nix @@ -220,7 +220,7 @@ in lib.fix(self: { bat chromium clang-manpages - clang-tools + clang-tools_11 clang_11 curl direnv |