diff --git a/flake.nix b/flake.nix index 19b1fe16..bed4da02 100644 --- a/flake.nix +++ b/flake.nix @@ -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; diff --git a/overlays/default.nix b/overlays/default.nix index e6bffb01..9bef3115 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -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 [ ] ++ [