Skip to content

Commit 5da5a93

Browse files
committed
flake: update and upgrade to llvm 18
Signed-off-by: Yuxuan Shui <[email protected]>
1 parent 2dc2188 commit 5da5a93

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

flake.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+14-6
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,19 @@
4848
(final: prev: {
4949
stdenv = prev.withCFlags "-fno-omit-frame-pointer" prev.stdenv;
5050
})
51+
(final: prev: {
52+
llvmPackages_18 = prev.llvmPackages_18 // {
53+
stdenv = final.withCFlags "-fno-omit-frame-pointer" prev.llvmPackages_18.stdenv;
54+
};
55+
})
5156
];
5257
};
5358

5459
overlays = [overlay];
5560
mkDevShell = p: p.overrideAttrs (o: {
5661
nativeBuildInputs = o.nativeBuildInputs ++ (with pkgs; [
57-
clang-tools_17
58-
llvmPackages_17.clang-unwrapped.python
62+
clang-tools_18
63+
llvmPackages_18.clang-unwrapped.python
5964
python
6065
]);
6166
hardeningDisable = ["fortify"];
@@ -72,15 +77,18 @@
7277
overlay
7378
overlays
7479
;
75-
defaultPackage = pkgs.picom;
76-
devShells.default = mkDevShell defaultPackage;
80+
packages = {
81+
default = pkgs.picom;
82+
llvm = profilePkgs.llvm_18;
83+
};
84+
devShells.default = mkDevShell packages.default;
7785
devShells.useClang = devShells.default.override {
78-
inherit (pkgs.llvmPackages_17) stdenv;
86+
inherit (pkgs.llvmPackages_18) stdenv;
7987
};
8088
# build picom and all dependencies with frame pointer, making profiling/debugging easier.
8189
# WARNING! many many rebuilds
8290
devShells.useClangProfile = (mkDevShell profilePkgs.picom).override {
83-
stdenv = profilePkgs.withCFlags "-fno-omit-frame-pointer" profilePkgs.llvmPackages_17.stdenv;
91+
stdenv = profilePkgs.withCFlags "-fno-omit-frame-pointer" profilePkgs.llvmPackages_18.stdenv;
8492
};
8593
});
8694
}

0 commit comments

Comments
 (0)