From 874c6ab200e9e325ee91747501dc830706bdce79 Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <fufexan@protonmail.com>
Date: Wed, 3 Jan 2024 17:24:17 +0200
Subject: [PATCH] Fix Nix

---
 flake.lock       | 64 ++++++++++++++++++++++++++++++------------------
 flake.nix        |  1 -
 nix/overlays.nix |  1 +
 src/meson.build  |  1 +
 4 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/flake.lock b/flake.lock
index fa6d320..8950839 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,23 +1,5 @@
 {
   "nodes": {
-    "hyprlang": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1704112024,
-        "narHash": "sha256-eKS5iEiyfxQYc4R0Bofxtd9rdCCDzw8kpYZx/xj6wb0=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "5cb3d2ba62d94b1e470d308ae05a9589b22c3c07",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
@@ -41,13 +23,47 @@
         "type": "github"
       }
     },
+    "hyprlang": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1704287638,
+        "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1694183432,
-        "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=",
+        "lastModified": 1702645756,
+        "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1703961334,
+        "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b",
+        "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
         "type": "github"
       },
       "original": {
@@ -60,9 +76,9 @@
     "root": {
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
-        "nixpkgs": "nixpkgs",
-        "systems": "systems",
-        "hyprlang": "hyprlang"
+        "hyprlang": "hyprlang",
+        "nixpkgs": "nixpkgs_2",
+        "systems": "systems"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index 1aafb59..e489a02 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,7 +38,6 @@
     packages = eachSystem (system: {
       inherit (pkgsFor.${system}) xdg-desktop-portal-hyprland;
       default = self.packages.${system}.xdg-desktop-portal-hyprland;
-      inherit (inputs.hyprlang.packages.${system}) hyprlang;
     });
 
     formatter = eachSystem (system: nixpkgs.legacyPackages.${system}.alejandra);
diff --git a/nix/overlays.nix b/nix/overlays.nix
index 66524ce..550045c 100644
--- a/nix/overlays.nix
+++ b/nix/overlays.nix
@@ -25,6 +25,7 @@ in {
       inherit (final) hyprland-protocols;
       inherit (final.qt6) qtbase qttools wrapQtAppsHook qtwayland;
       inherit version;
+      inherit (inputs.hyprlang.packages.${prev.system}) hyprlang;
     };
   };
 }
diff --git a/src/meson.build b/src/meson.build
index c3d3735..f816508 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -5,6 +5,7 @@ executable('xdg-desktop-portal-hyprland',
   [src, wl_proto_files],
   dependencies: [
     dependency('gbm'),
+    dependency('hyprlang'),
     dependency('libdrm'),
     dependency('libpipewire-0.3'),
     dependency('sdbus-c++'),