nix: add hyprland-protocols through pkgconfig (#1275)

3 files changed, 11 insertions, 10 deletions

diff --git a/flake.lock b/flake.lock
index b348c55e..ce27045c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,13 +1,17 @@
 {
   "nodes": {
     "hyprland-protocols": {
-      "flake": false,
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1670703428,
-        "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=",
+        "lastModified": 1671839510,
+        "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da",
+        "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a6def7bd..b3f8e70e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
 
     hyprland-protocols = {
       url = "github:hyprwm/hyprland-protocols";
-      flake = false;
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
@@ -50,7 +50,7 @@
         stdenv = prev.gcc12Stdenv;
         version = props.version + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
         wlroots = wlroots-hyprland;
-        inherit (inputs) hyprland-protocols;
+        inherit (inputs.hyprland-protocols.packages.${prev.hostPlatform.system}) hyprland-protocols;
       };
       hyprland-debug = hyprland.override {debug = true;};
       hyprland-no-hidpi = hyprland.override {hidpiXWayland = false;};
diff --git a/nix/default.nix b/nix/default.nix
index c45969f4..89037960 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -67,6 +67,7 @@ in
         [
           git
           cairo
+          hyprland-protocols
           libdrm
           libinput
           libxkbcommon
@@ -99,10 +100,6 @@ in
       postPatch = ''
         # Fix hardcoded paths to /usr installation
         sed -i "s#/usr#$out#" src/render/OpenGL.cpp
-
-        # for some reason rmdir doesn't work in a dirty tree
-        rmdir subprojects/hyprland-protocols || true
-        ln -s ${hyprland-protocols} subprojects/hyprland-protocols
       '';
 
       passthru.providedSessions = ["hyprland"];