diff --git a/flake.lock b/flake.lock index eefbf26..636afc9 100644 --- a/flake.lock +++ b/flake.lock @@ -4,15 +4,16 @@ "inputs": { "hyprland-protocols": "hyprland-protocols", "nixpkgs": "nixpkgs", + "systems": "systems", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1682548480, - "narHash": "sha256-aycGKS+Vv/lQQFaYJNpK054leLKIapfUobgzt8fohFA=", + "lastModified": 1696409047, + "narHash": "sha256-bRJI/iy3dQH5GuT/xTE1rZbfs2Rpier3l5aOY05LY/Y=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "72d2f33b34951b7f5be6cdbc302b1c6a33cbf60f", + "rev": "2901bb0d2f69f90bc4e2f8fabbc78a0df8130523", "type": "github" }, "original": { @@ -26,14 +27,18 @@ "nixpkgs": [ "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1681065697, - "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "type": "github" }, "original": { @@ -44,11 +49,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1682453498, - "narHash": "sha256-WoWiAd7KZt5Eh6n+qojcivaVpnXKqBsVgpixpV2L9CE=", + "lastModified": 1694767346, + "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8018361fa1d1650ee8d4b96294783cf564e8a7f", + "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", "type": "github" }, "original": { @@ -63,21 +68,37 @@ "hyprland": "hyprland" } }, + "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1682436395, - "narHash": "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=", + "lastModified": 1696255886, + "narHash": "sha256-0KZfiqqREousitBgG1mkzKmmNX4tjOIWdbBm6MvRCjQ=", "owner": "wlroots", "repo": "wlroots", - "rev": "6830bfc17fd94709e2cdd4da0af989f102a26e59", + "rev": "5ef42e8e8adece098848fac53c721b6eb3818fc2", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", + "rev": "5ef42e8e8adece098848fac53c721b6eb3818fc2", "type": "gitlab" } }, @@ -90,14 +111,18 @@ "nixpkgs": [ "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1682439384, - "narHash": "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=", + "lastModified": 1694628480, + "narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c0e233955568fbea4e859336f6d3d14d51294d7c", + "rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ff54d15..31205b2 100644 --- a/flake.nix +++ b/flake.nix @@ -11,13 +11,22 @@ withPkgsFor = fn: nixpkgs.lib.genAttrs (builtins.attrNames hyprland.packages) (system: fn system nixpkgs.legacyPackages.${system}); in { packages = withPkgsFor (system: pkgs: { - borders-plus-plus = pkgs.callPackage ./borders-plus-plus {inherit (hyprland.packages.${system}) hyprland;}; - csgo-vulkan-fix = pkgs.callPackage ./csgo-vulkan-fix {inherit (hyprland.packages.${system}) hyprland;}; - hyprbars = pkgs.callPackage ./hyprbars {inherit (hyprland.packages.${system}) hyprland;}; + borders-plus-plus = pkgs.callPackage ./borders-plus-plus { + inherit (hyprland.packages.${system}) hyprland; + stdenv = pkgs.gcc13Stdenv; + }; + csgo-vulkan-fix = pkgs.callPackage ./csgo-vulkan-fix { + inherit (hyprland.packages.${system}) hyprland; + stdenv = pkgs.gcc13Stdenv; + }; + hyprbars = pkgs.callPackage ./hyprbars { + inherit (hyprland.packages.${system}) hyprland; + stdenv = pkgs.gcc13Stdenv; + }; }); devShells = withPkgsFor (system: pkgs: { - default = pkgs.mkShell { + default = pkgs.mkShell.override {stdenv = pkgs.gcc13Stdenv;} { name = "hyprland-plugins"; buildInputs = [hyprland.packages.${system}.hyprland]; inputsFrom = [hyprland.packages.${system}.hyprland];