packages/tetrio: update

packages/tetrio/base.nix

@@ -6,6 +6,9 @@
 , autoPatchelfHook
 , alsa-lib
 , cups
+, dpkg
+, gtk3
+, libpulseaudio
 , libX11
 , libXScrnSaver
 , libXtst
@@ -20,26 +23,20 @@ stdenv.mkDerivation rec {
   version = "8.0.0";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20211228025517/https://tetr.io/about/desktop/builds/TETR.IO%20Setup.deb";
+    url = "https://web.archive.org/web/20211228025517if_/https://tetr.io/about/desktop/builds/TETR.IO%20Setup.deb";
     name = "${pname}.deb";
     sha256 = "1nlblfhrph4cw8rpic9icrs78mzrxyskl7ggyy2i8bk9i07i21xf";
   };
 
   nativeBuildInputs = [
-    alsa-lib
+    dpkg
     autoPatchelfHook
-    cups
-    libX11
-    libXScrnSaver
-    libXtst
-    mesa
-    nss
     wrapGAppsHook
   ];
 
   dontWrapGApps = true;
 
-  libPath = lib.makeLibraryPath [
+  buildInputs = [
     alsa-lib
     cups
     libX11
@@ -47,23 +44,35 @@ stdenv.mkDerivation rec {
     libXtst
     mesa
     nss
+    gtk3
+  ];
+
+  libPath = lib.makeLibraryPath [
+    libpulseaudio
     systemd
   ];
 
-  unpackPhase = ''
+  unpackCmd = "dpkg -x $curSrc src";
-    mkdir -p $TMP/${pname} $out/bin
-    cp $src $TMP/${pname}.deb
-    ar vx $TMP/${pname}.deb
-    tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/${pname}/
-  '';
 
   installPhase = ''
-    cp -R $TMP/${pname}/{usr/share,opt} $out/
+    runHook preInstall
-    wrapProgram $out/opt/TETR.IO/${pname} \
+
-      --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/TETR.IO
+    mkdir $out
-    ln -s $out/opt/TETR.IO/${pname} $out/bin/
+    cp -r opt/ usr/share/ $out
-    substituteInPlace $out/share/applications/${pname}.desktop \
+
-      --replace "Exec=\"/opt/TETR.IO/${pname}\"" "Exec=\"$out/opt/TETR.IO/${pname}\""
+    mkdir $out/bin
+    ln -s $out/opt/TETR.IO/tetrio-desktop $out/bin/
+
+    substituteInPlace $out/share/applications/tetrio-desktop.desktop \
+      --replace "Exec=\"/opt/TETR.IO/tetrio-desktop\"" "Exec=\"$out/opt/TETR.IO/tetrio-desktop\""
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    wrapProgram $out/opt/TETR.IO/tetrio-desktop \
+      --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/TETR.IO \
+      ''${gappsWrapperArgs[@]}
   '';
 
   meta = with lib; {

packages/tetrio/plus.nix

@@ -1,32 +1,43 @@
 {
+  fetchzip,
+  lib,
   symlinkJoin,
   stdenvNoCC,
   tetrio-desktop,
   unzip
 }:
+
 let
   version = "0.23.7";
-  patchedAsar = stdenvNoCC.mkDerivation {
-    inherit version;
-    name = "tetrio-plus";
-    src = builtins.fetchurl {
-      url = "https://gitlab.com/UniQMG/tetrio-plus/uploads/e51f2fd7a1370bf4ceeecd371204c2e1/tetrio-plus_0.23.7_app.asar.zip";
-      sha256 = "03nla54r6s2xhd1ipxl0ffx6q0brby1jlxdx8p2q1nw80dx4gf1l";
-    };
-    dontUnpack = true;
 
-    nativeBuildInputs = [ unzip ];
+  patchedAsar = stdenvNoCC.mkDerivation rec {
-    buildPhase = ''
+    pname = "tetrio-plus";
-      mkdir -p $out
+    version = "0.25.3";
-      unzip $src -d $out
+
+    src = fetchzip {
+      url = "https://gitlab.com/UniQMG/tetrio-plus/uploads/684477053451cd0819e2c84e145966eb/tetrio-plus_0.25.3_app.asar.zip";
+      sha256 = "sha256-GQgt4GZNeKx/uzmVsuKppW2zg8AAiGqsk2JYJIkqfVE=";
+    };
+
+    installPhase = ''
+      runHook preInstall
+      install app.asar $out
+      runHook postInstall
     '';
-    dontInstall = true;
+
+    meta = with lib; {
+      description = "TETR.IO customization toolkit";
+      homepage = "https://gitlab.com/UniQMG/tetrio-plus";
+      license = licenses.mit;
+      maintainers = with maintainers; [ huantian ];
+      platforms = [ "x86_64-linux" ];
+    };
   };
 in tetrio-desktop.overrideAttrs(old: {
   pname = "tetrio-desktop-plus";
   version = old.version + "+${version}";
 
-  installPhase = old.installPhase + ''
+  postInstall = ''
-    cp ${patchedAsar}/app.asar $out/opt/TETR.IO/resources
+    cp ${patchedAsar} $out/opt/TETR.IO/resources/app.asar
   '';
 })

users/rin/packages.nix

@@ -33,7 +33,8 @@
     lutris
     insomnia
     maim
-    #me.tetrio-desktop-plus
+    me.rivalcfg
+    me.tetrio-desktop-plus
     mumble
     obs-studio
     openjdk17