Skip to content

Commit 6402e86

Browse files
committed
update flakes
1 parent 72df9d5 commit 6402e86

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

flake.nix

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@
3636
})
3737
];
3838
};
39-
stdenv = pkgs.llvmPackages_18.stdenv;
39+
stdenv = pkgs.llvmPackages_19.stdenv;
40+
#stdenv = pkgs.gcc12Stdenv;
4041
operon = import ./operon.nix { inherit stdenv pkgs system; };
4142
in
4243
rec
4344
{
4445
packages = {
4546
default = operon.overrideAttrs (old: {
46-
cmakeFlags = old.cmakeFlags ++ [ "-DBUILD_CLI_PROGRAMS=ON" ];
47+
cmakeFlags = old.cmakeFlags ++ [ "-DBUILD_CLI_PROGRAMS=ON" "-DCPM_USE_LOCAL_PACKAGES=ON" ];
4748
});
4849

4950
library = operon.overrideAttrs (old: {
@@ -59,15 +60,14 @@
5960
name = "operon";
6061

6162
nativeBuildInputs = operon.nativeBuildInputs ++ (with pkgs; [
62-
clang-tools_18
63+
clang-tools_19
6364
cppcheck
6465
include-what-you-use
6566
cmake-language-server
6667
]);
6768

6869
buildInputs = operon.buildInputs ++ (with pkgs; [
6970
gdb
70-
gcc13
7171
graphviz
7272
hyperfine
7373
linuxPackages_latest.perf

operon.nix

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99
"x86_64-linux" = "build-linux";
1010
"x86_64-darwin" = "build-linux";
1111
"aarch64-darwin" = "build-osx";
12-
}."${system}";
12+
}."${system}";
1313

1414
cmakeFlags = [
1515
"--preset ${cmakePreset}"
@@ -27,9 +27,8 @@ stdenv.mkDerivation rec {
2727
doctest
2828
eigen
2929
eve
30-
fast-float
30+
(fast-float.overrideAttrs({ version = "6.1.6"; }))
3131
fmt
32-
icu
3332
jemalloc
3433
cpptrace
3534
libassert

0 commit comments

Comments
 (0)