Fixed build for Nix/OS users

2 files changed, 35 insertions, 8 deletions

diff --git a/flake.lock b/flake.lock
index b2b41913..061978e7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -68,11 +68,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1652574577,
-        "narHash": "sha256-MoSWPtue4Wi9+kRDxUbLWEBCL8Bswaa8kVMh2JYpSJg=",
+        "lastModified": 1652659998,
+        "narHash": "sha256-FqNrXC1EE6U2RACwXBlsAvg1lqQGLYpuYb6+W3DL9vA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "118ec238bfb788a34f1d53c4d95931fadfa70367",
+        "rev": "1d7db1b9e4cf1ee075a9f52e5c36f7b9f4207502",
         "type": "github"
       },
       "original": {
@@ -138,7 +138,8 @@
       "inputs": {
         "nixpkgs": "nixpkgs",
         "nixpkgs-wayland": "nixpkgs-wayland",
-        "utils": "utils"
+        "utils": "utils",
+        "wlroots-git": "wlroots-git"
       }
     },
     "utils": {
@@ -155,6 +156,24 @@
         "repo": "flake-utils",
         "type": "github"
       }
+    },
+    "wlroots-git": {
+      "flake": false,
+      "locked": {
+        "host": "gitlab.freedesktop.org",
+        "lastModified": 1652629480,
+        "narHash": "sha256-4mouFPYB2VwgPi92trvAk8JAGjvkYm+DX72sUzljCXA=",
+        "owner": "wlroots",
+        "repo": "wlroots",
+        "rev": "8fe3aa29da56be16faa73aca947647bd60cd4a94",
+        "type": "gitlab"
+      },
+      "original": {
+        "host": "gitlab.freedesktop.org",
+        "owner": "wlroots",
+        "repo": "wlroots",
+        "type": "gitlab"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index db290d75..2a4d5e0a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,17 +3,23 @@
   description =
     "Hyprland is a dynamic tiling Wayland compositor that doesn't sacrifice on its looks.";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
     utils.url = "github:numtide/flake-utils";
     nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
+    wlroots-git = {
+      url = "gitlab:wlroots/wlroots?host=gitlab.freedesktop.org";
+      flake = false;
+    };
   };
 
-  outputs = { self, nixpkgs, utils, nixpkgs-wayland }:
+  outputs = { self, nixpkgs, utils, nixpkgs-wayland, wlroots-git }:
     {
       overlay = final: prev: {
         hyprland = prev.callPackage self {
           src = self;
-          wlroots = (nixpkgs-wayland.overlays.default final prev).wlroots;
+          wlroots = (nixpkgs-wayland.overlays.default final prev).wlroots.overrideAttrs (prev: rec {
+            src = wlroots-git;
+          });
         };
       };
       overlays.default = self.overlay;
@@ -23,7 +29,9 @@
         packages = {
           hyprland = pkgs.callPackage self {
             src = self;
-            inherit (nixpkgs-wayland.packages.${system}) wlroots;
+            wlroots = nixpkgs-wayland.packages.${system}.wlroots.overrideAttrs (prev: rec {
+            src = wlroots-git;
+          });
           };
         };
         defaultPackage = packages.hyprland;