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

Make harmonia overlay local

This commit is contained in:
Sandro - 2023-04-04 02:08:52 +02:00
parent 99cead2130
commit 5b5d8eb4dc
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flake.nix
View File

@ -273,7 +273,6 @@
self.nixosModules.c3d2 self.nixosModules.c3d2
c3d2-user-module.nixosModule c3d2-user-module.nixosModule
harmonia.nixosModules.harmonia
nixos-modules.nixosModule nixos-modules.nixosModule
./config ./config
./modules/audio-server.nix ./modules/audio-server.nix
@ -284,7 +283,7 @@
}; };
in { in {
overlays = import ./overlays { overlays = import ./overlays {
inherit (inputs) bevy-julia bevy-mandelbrot harmonia tracer; inherit (inputs) bevy-julia bevy-mandelbrot tracer;
}; };
legacyPackages = lib.attrsets.mapAttrs (_: pkgs: pkgs.appendOverlays overlayList) nixos.legacyPackages; legacyPackages = lib.attrsets.mapAttrs (_: pkgs: pkgs.appendOverlays overlayList) nixos.legacyPackages;
@ -436,6 +435,13 @@
skyflake.nixosModules.default skyflake.nixosModules.default
harmonia.nixosModules.harmonia harmonia.nixosModules.harmonia
./hosts/hydra ./hosts/hydra
{
nixpkgs.overlays = [
(final: prev: with final; {
harmonia = harmonia.packages.${system}.harmonia.override { pkgs = prev // { rustPlatform = rustPackages_1_66.rustPlatform; }; };
})
];
}
]; ];
}; };

3
overlays/default.nix
View File

@ -1,6 +1,5 @@
{ bevy-julia { bevy-julia
, bevy-mandelbrot , bevy-mandelbrot
, harmonia
, tracer , tracer
}: }:
@ -36,8 +35,6 @@ with final; {
commandLineArgs = "--enable-features=VaapiVideoEncoder,VaapiVideoDecoder,CanvasOopRasterization --force-dark-mode"; 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 flake
hydra = prev.hydra.overrideAttrs (oldAttrs: { hydra = prev.hydra.overrideAttrs (oldAttrs: {
patches = oldAttrs.patches or [ ] ++ [ patches = oldAttrs.patches or [ ] ++ [