Skip to content

Commit fcd51e7

Browse files
committed
build: add libepoxy
Add libepoxy dependency to CI manifest and Nix. For Nix, we need to set shellHook to workaround a NixOS limitation, see: NixOS/nixpkgs#287763 Signed-off-by: Yuxuan Shui <[email protected]>
1 parent dff77aa commit fcd51e7

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

.builds/freebsd.yml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ packages:
1212
- uthash
1313
- libconfig
1414
- libglvnd
15+
- libepoxy
1516
- dbus
1617
- pcre
1718
sources:

.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ root = true
33
indent_style = tab
44
indent_size = 8
55
max_line_length = 90
6+
[*.nix]
7+
indent_style = space
8+
indent_size = 2

flake.nix

+12-6
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,22 @@
2424
overlays = [ overlay ];
2525
in rec {
2626
inherit overlay overlays;
27-
defaultPackage = pkgs.picom.overrideAttrs {
27+
defaultPackage = pkgs.picom.overrideAttrs (o: {
2828
version = "11";
2929
src = ./.;
30-
};
30+
buildInputs = o.buildInputs ++ [ pkgs.libepoxy ];
31+
});
3132
devShell = defaultPackage.overrideAttrs {
32-
buildInputs = defaultPackage.buildInputs ++ [
33-
pkgs.clang-tools_17
34-
pkgs.llvmPackages_17.clang-unwrapped.python
35-
];
33+
buildInputs = defaultPackage.buildInputs ++ (with pkgs; [
34+
clang-tools_17
35+
llvmPackages_17.clang-unwrapped.python
36+
]);
3637
hardeningDisable = [ "fortify" ];
38+
shellHook = ''
39+
# Workaround a NixOS limitation on sanitizers:
40+
# See: https://github.com/NixOS/nixpkgs/issues/287763
41+
export LD_LIBRARY_PATH+=":/run/opengl-driver/lib"
42+
'';
3743
};
3844
});
3945
}

0 commit comments

Comments
 (0)