feat: rewrite to more nixy flakes

2026-03-10 17:41:28 +01:00
parent 2c8cf957ee
commit d41abb956a
36 changed files with 1610 additions and 779 deletions
@@ -1,30 +1,22 @@
 {
-    pkgs ? import <nixpkgs> { },
-    fetchzip ? pkgs.fetchzip,
-	withTetrioPlus ? false,
-	tetrio-plus ? pkgs.tetrio-plus,
+    dpkg,
+    fetchzip,
+    tetrio-desktop,
+    withTetrioPlus ? false,
+    tetrio-plus,
    ...
 }:

 let
-    tetrio-desktop =
-        let
-            version = "10";
-        in
-        {
-            inherit version;
-            src = fetchzip {
-                url = "https://tetr.io/about/desktop/builds/${version}/TETR.IO%20Setup.deb";
-                hash = "sha256-2FtFCajNEj7O8DGangDecs2yeKbufYLx1aZb3ShnYvw=";
-                nativeBuildInputs = with pkgs; [ dpkg ];
-            };
-        };
+    version = "10";
+    src = fetchzip {
+        url = "https://tetr.io/about/desktop/builds/${version}/TETR.IO%20Setup.deb";
+        hash = "sha256-2FtFCajNEj7O8DGangDecs2yeKbufYLx1aZb3ShnYvw=";
+        nativeBuildInputs = [ dpkg ];
+    };

 in

-(pkgs.tetrio-desktop.overrideAttrs {
-    version = tetrio-desktop.version;
-    src = tetrio-desktop.src;
-}).override {
-	inherit withTetrioPlus tetrio-plus;
+(tetrio-desktop.overrideAttrs { inherit src version; }).override {
+    inherit withTetrioPlus tetrio-plus;
 }