c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Fix harmonia deployment

This commit is contained in:
Sandro - 2023-04-04 00:06:09 +02:00
parent 3e21dc9827
commit 24a1647040
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flake.nix
View File

@ -90,7 +90,7 @@
flake-utils.url = "github:numtide/flake-utils";
# TODO: drop when switching to 23.05 and check if treefmt-nix is still used
harmonia = {
url = "github:nix-community/harmonia";
url = "github:SuperSandro2000/harmonia/flake-lock";
inputs = {
flake-parts.follows = "flake-parts";
nixpkgs.follows = "nixos";
@ -285,7 +285,7 @@
};
in {
overlays = import ./overlays {
inherit (inputs) tracer bevy-mandelbrot bevy-julia;
inherit (inputs) bevy-julia bevy-mandelbrot harmonia tracer;
};
legacyPackages = lib.attrsets.mapAttrs (_: pkgs: pkgs.appendOverlays overlayList) nixos.legacyPackages;

3
overlays/default.nix
View File

@ -1,5 +1,6 @@
{ bevy-julia
, bevy-mandelbrot
, harmonia
, tracer
}:
@ -35,6 +36,8 @@ with final; {
commandLineArgs = "--enable-features=VaapiVideoEncoder,VaapiVideoDecoder,CanvasOopRasterization --force-dark-mode";
};
harmonia = harmonia.packages.${system}.harmonia.override { pkgs = prev // { rustPlatform = rustPackages_1_66.rustPlatform; }; };
# hydra flake
hydra = prev.hydra.overrideAttrs (oldAttrs: {
patches = oldAttrs.patches or [ ] ++ [