From f4dd8846a599a97203ecec0ae397ed450c097ca0 Mon Sep 17 00:00:00 2001 From: Vika Date: Wed, 19 Feb 2025 21:06:51 +0300 Subject: Update libadwaita to a beta version and fix overlays --- flake.nix | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index d309bf4..7489e2c 100644 --- a/flake.nix +++ b/flake.nix @@ -19,8 +19,30 @@ outputs = { self, nixpkgs, flake-utils, crane }: let supportedSystems = ["aarch64-linux" "x86_64-linux"]; forAllSystems = f: flake-utils.lib.eachSystem supportedSystems f; - in forAllSystems (system: let - pkgs = nixpkgs.legacyPackages.${system}; + in { + overlays.default = final: prev: { + bowl = final.callPackage ./default.nix { + craneLib = crane.mkLib final; + }; + }; + overlays.adwaita = final: prev: { + libadwaita = prev.libadwaita.overrideAttrs (old: rec { + version = "1.7.beta"; + + src = final.fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "libadwaita"; + rev = version; + hash = "sha256-Nym/odhjXlQXF7YfXZ6+fVutZS1iTCvsJI8/b0CbQ2Q="; + }; + }); + }; + } // forAllSystems (system: let + pkgs = import nixpkgs { + overlays = [ self.overlays.adwaita ]; + localSystem = { inherit system; }; + }; crane' = crane.mkLib pkgs; bowl = pkgs.callPackage ./default.nix { @@ -44,12 +66,8 @@ cd $out/share/icons/Colloid-Dark/apps/scalable ln -sr ../../../Colloid-Light/apps/scalable/xyz.vikanezrimaya.kittybox.Bowl.svg $out/share/icons/Colloid-Dark/apps/scalable/xyz.vikanezrimaya.kittybox.Bowl.svg ''; - }; - overlays.default = final: prev: { - bowl = final.callPackage ./default.nix { - craneLib = crane.mkLib final; - }; + libadwaita = pkgs.libadwaita; }; checks = { -- cgit 1.4.1