From 3e884d941ca819c1f2e50df8bdae0debded1ed87 Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <mihai@fufexan.net>
Date: Tue, 17 Dec 2024 10:08:11 +0200
Subject: [PATCH] flake.lock: update

nix/overlays: add overlay to allow building until next hyprland version
---
 flake.lock       | 49 +++++++++++++-----------------------------------
 flake.nix        |  1 +
 nix/overlays.nix | 31 +++++++++++++++++++++++-------
 3 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7ce4b5b..68ec596 100644
--- a/flake.lock
+++ b/flake.lock
@@ -25,7 +25,9 @@
     },
     "hyprlang": {
       "inputs": {
-        "hyprutils": "hyprutils",
+        "hyprutils": [
+          "hyprutils"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -34,11 +36,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728168612,
-        "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=",
+        "lastModified": 1734364628,
+        "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e",
+        "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5",
         "type": "github"
       },
       "original": {
@@ -48,31 +50,6 @@
       }
     },
     "hyprutils": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprlang",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprlang",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1721324102,
-        "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=",
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "rev": "962582a090bc233c4de9d9897f46794280288989",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "type": "github"
-      }
-    },
-    "hyprutils_2": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
@@ -82,11 +59,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732288281,
-        "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=",
+        "lastModified": 1733502241,
+        "narHash": "sha256-KAUNC4Dgq8WQjYov5auBw/usaHixhacvb7cRDd0AG/k=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c",
+        "rev": "104117aed6dd68561be38b50f218190aa47f2cd8",
         "type": "github"
       },
       "original": {
@@ -120,11 +97,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732837521,
-        "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
+        "lastModified": 1734119587,
+        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
+        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
         "type": "github"
       },
       "original": {
@@ -138,7 +115,7 @@
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang",
-        "hyprutils": "hyprutils_2",
+        "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "nixpkgs": "nixpkgs",
         "systems": "systems"
diff --git a/flake.nix b/flake.nix
index 7151320..e6c46e3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,6 +15,7 @@
 
     hyprlang = {
       url = "github:hyprwm/hyprlang";
+      inputs.hyprutils.follows = "hyprutils";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.systems.follows = "systems";
     };
diff --git a/nix/overlays.nix b/nix/overlays.nix
index 0de6d02..f69893a 100644
--- a/nix/overlays.nix
+++ b/nix/overlays.nix
@@ -17,6 +17,7 @@ in {
   default = lib.composeManyExtensions [
     self.overlays.xdg-desktop-portal-hyprland
     self.overlays.sdbus-cpp_2
+    self.overlays.hypr-gcc14Stdenv
     inputs.hyprland-protocols.overlays.default
     inputs.hyprwayland-scanner.overlays.default
     inputs.hyprlang.overlays.default
@@ -46,15 +47,31 @@ in {
   #
   # TODO: Remove this overlay after the next stable Nixpkgs release.
   sdbus-cpp_2 = final: prev: {
-    sdbus-cpp_2 = prev.sdbus-cpp_2 or (final.sdbus-cpp.overrideAttrs (self: _: {
-      version = "2.0.0";
+    sdbus-cpp_2 =
+      prev.sdbus-cpp_2
+      or (final.sdbus-cpp.overrideAttrs (self: _: {
+        version = "2.0.0";
 
+        src = final.fetchFromGitHub {
+          owner = "Kistler-group";
+          repo = "sdbus-cpp";
+          rev = "v${self.version}";
+          hash = "sha256-W8V5FRhV3jtERMFrZ4gf30OpIQLYoj2yYGpnYOmH2+g=";
+        };
+      }));
+  };
+
+  # TODO: remove this when the next version of Hyprland is available (in Nixpkgs)
+  hypr-gcc14Stdenv = final: prev: {
+    hyprcursor = (prev.hyprcursor.override {stdenv = prev.gcc14Stdenv;}).overrideAttrs (self: super: {
       src = final.fetchFromGitHub {
-        owner = "Kistler-group";
-        repo = "sdbus-cpp";
-        rev = "v${self.version}";
-        hash = "sha256-W8V5FRhV3jtERMFrZ4gf30OpIQLYoj2yYGpnYOmH2+g=";
+        owner = "hyprwm";
+        repo = "hyprcursor";
+        rev = "f388aacd22be4a6e4d634fbaf6f75eb0713d239a";
+        hash = "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=";
       };
-    }));
+    });
+    hyprlang = prev.hyprlang.override {stdenv = prev.gcc14Stdenv;};
+    hyprutil = prev.hyprutil.override {stdenv = prev.gcc14Stdenv;};
   };
 }