Fix nix stuff

flake.nix

@@ -3,33 +3,35 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    utils.url = "github:numtide/flake-utils";
+    systems.url = "github:nix-systems/default-linux";
 
-    hyprlang = {
-      url = "github:hyprwm/hyprlang";
+    hyprcursor = {
+      url = "github:hyprwm/hyprcursor";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
   outputs =
     {
+      self,
       nixpkgs,
-      utils,
-      hyprlang,
-    }:
-    utils.lib.eachDefaultSystem (
-      system:
-      let
-        pkgs = import nixpkgs { inherit system; };
-      in
+      hyprcursor,
+      systems,
+      ...
+    }@inputs:
+    let
+      pkgs = nixpkgs;
+      eachSystem = pkgs.lib.genAttrs (import systems);
+    in
+    {
+      packages = eachSystem (system: {
+        default = self.packages.${system}.mcmojave-hyprcursor;
 
-      {
-        packages = {
-          mcmojave-hyprcursor-light = pkgs.callPackage ./nix/light.nix { inherit pkgs; };
-          mcmojave-hyprcursor-dark = pkgs.callPackage ./nix/dark.nix { inherit pkgs; };
+        mcmojave-hyprcursor = inputs.nixpkgs.legacyPackages.${system}.callPackage ./nix {
+          inherit hyprcursor;
         };
+      });
 
-        formatter = nixpkgs.${system}.nixpkgs-fmt;
-      }
-    );
+      formatter = eachSystem (system: nixpkgs.${system}.nixpkgs-format);
+    };
 }

nix/default.nix

@@ -1,23 +1,20 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
+  hyprcursor,
 }:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
   pname = "mcmojave-hyprcursor";
   version = "0.1";
-  src = fetchFromGitHub {
-    owner = "libadoxon";
-    repo = "mcmojave-hyprcursor";
-    rev = "d2c0e6802f0ed1e7c638bb27b5aa8587b578d083";
-    sha256 = "sha256-ArUX5qlqAXUqcRqHz4QxXy3KgkfasTPA/Qwf6D2kV0U=";
-  };
+  src = ../.;
+
+  nativeBuildInputs = [ hyprcursor.packages.${stdenv.hostPlatform.system}.hyprcursor ];
 
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out/share/icons/mcmojave-hyprcursor
-    cp -R . $out/share/icons/mcmojave-hyprcursor/
+    hyprcursor-util --create $src -o $out/share/icons/mcmojave-hyprcursor/
 
     runHook postInstall
   '';
@@ -29,4 +26,4 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.gpl3;
     maintainers = with maintainers; [ libadoxon ];
   };
-})
+}