From d4f50358ad2ee4aa18a96c97bea9eb9f3952880b Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <mihai@fufexan.net>
Date: Tue, 16 Jul 2024 22:51:25 +0300
Subject: [PATCH] Nix: add hyprutils dep

flake.lock: update
---
 flake.lock      | 55 +++++++++++++++++++++++--------------------------
 flake.nix       | 38 ++++++++++++++++++++++------------
 nix/default.nix | 10 +++++----
 3 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6cb2fcb..d6d13af 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,8 +2,12 @@
   "nodes": {
     "hyprlang": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
-        "systems": "systems"
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": [
+          "systems"
+        ]
       },
       "locked": {
         "lastModified": 1713121246,
@@ -19,23 +23,30 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
+    "hyprutils": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": [
+          "systems"
+        ]
+      },
       "locked": {
-        "lastModified": 1708475490,
-        "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0e74ca98a74bc7270d28838369593635a5db3260",
+        "lastModified": 1721071737,
+        "narHash": "sha256-qmC9jGfbE4+EIBbbSAkrfR/p49wShjpv4/KztgE/P54=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "eb1ceff2b87f6820789249f63faa8e9dcb54d05f",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs": {
       "locked": {
         "lastModified": 1712963716,
         "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
@@ -54,8 +65,9 @@
     "root": {
       "inputs": {
         "hyprlang": "hyprlang",
-        "nixpkgs": "nixpkgs_2",
-        "systems": "systems_2"
+        "hyprutils": "hyprutils",
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
       }
     },
     "systems": {
@@ -72,21 +84,6 @@
         "repo": "default-linux",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "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"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 50e0dc9..79e4dd3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,10 +3,20 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-
-    hyprlang.url = "github:hyprwm/hyprlang";
-
     systems.url = "github:nix-systems/default-linux";
+
+    hyprutils = {
+      url = "github:hyprwm/hyprutils";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+    };
+
+    hyprlang = {
+      url = "github:hyprwm/hyprlang";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+      inputs.hyprutils.follows = "hyprutils";
+    };
   };
 
   outputs = {
@@ -31,16 +41,18 @@
   in {
     overlays = {
       default = self.overlays.hyprpaper;
-      hyprpaper = final: prev: rec {
-        hyprpaper = final.callPackage ./nix/default.nix {
-          stdenv = final.gcc13Stdenv;
-          version = "0.pre" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
-          commit = self.rev or "";
-          inherit (final.xorg) libXdmcp;
-          inherit (inputs.hyprlang.packages.${final.system}) hyprlang;
-        };
-        hyprpaper-debug = hyprpaper.override {debug = true;};
-      };
+      hyprpaper = lib.composeManyExtensions [
+        inputs.hyprlang.overlays.default
+        inputs.hyprutils.overlays.default
+        (final: prev: rec {
+          hyprpaper = final.callPackage ./nix/default.nix {
+            stdenv = final.gcc13Stdenv;
+            version = "0.7.0" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
+            commit = self.rev or "";
+          };
+          hyprpaper-debug = hyprpaper.override {debug = true;};
+        })
+      ];
     };
 
     packages = eachSystem (system: {
diff --git a/nix/default.nix b/nix/default.nix
index 32b0eee..3ec6642 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -8,6 +8,7 @@
   file,
   fribidi,
   hyprlang,
+  hyprutils,
   libdatrie,
   libGL,
   libjpeg,
@@ -22,7 +23,7 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  libXdmcp,
+  xorg,
   commit,
   debug ? false,
   version ? "git",
@@ -54,6 +55,7 @@ stdenv.mkDerivation {
     file
     fribidi
     hyprlang
+    hyprutils
     libdatrie
     libGL
     libjpeg
@@ -67,15 +69,15 @@ stdenv.mkDerivation {
     wayland
     wayland-protocols
     wayland-scanner
-    libXdmcp
+    xorg.libXdmcp
     util-linux
   ];
 
   meta = with lib; {
-    homepage = "https://github.com/hyprwm/hyprpaper";
     description = "A blazing fast wayland wallpaper utility with IPC controls";
+    homepage = "https://github.com/hyprwm/hyprpaper";
     license = licenses.bsd3;
-    platforms = platforms.linux;
     mainProgram = "hyprpaper";
+    platforms = platforms.linux;
   };
 }