diff options
| -rw-r--r-- | .nix/adaptive-cpp.nix | 4 | ||||
| -rw-r--r-- | default.nix | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/.nix/adaptive-cpp.nix b/.nix/adaptive-cpp.nix index a39d9b7..6537889 100644 --- a/.nix/adaptive-cpp.nix +++ b/.nix/adaptive-cpp.nix @@ -1,11 +1,11 @@ { lib , stdenv +, llvmPackages +, lld , fetchFromGitHub , cmake , makeWrapper , boost -, llvmPackages -, lld , python3 }: diff --git a/default.nix b/default.nix index 4142249..2d341d8 100644 --- a/default.nix +++ b/default.nix @@ -1,13 +1,15 @@ { pkgs ? import <nixpkgs> {} -, stdenv ? pkgs.llvmPackages_19.stdenv -, clang-tools ? pkgs.llvmPackages_19.clang-tools +, llvmPackages ? pkgs.llvmPackages_20 +, lld ? pkgs.lld_20 +, stdenv ? pkgs.llvmPackages_20.stdenv +, clang-tools ? pkgs.llvmPackages_20.clang-tools , gasp ? (import ((builtins.fetchGit { url = "git@git.keldu.de:apps/gasp"; ref = "master"; }).outPath + "/default.nix"){ }).gasp , adaptive-cpp ? (pkgs.callPackage ./.nix/adaptive-cpp.nix { - inherit stdenv; + inherit stdenv lld llvmPackages; }) }: @@ -130,7 +132,7 @@ in rec { inherit stdenv; inherit clang-tools; inherit adaptive-cpp; - openmp = pkgs.llvmPackages_19.openmp; + openmp = pkgs.llvmPackages_20.openmp; build_examples = "false"; build_benchmarks = "false"; |