From 57112d33a22c5c72927567b099bbc27e8d0158c8 Mon Sep 17 00:00:00 2001
From: Sasza Stanczew <sasza@stanczew.com>
Date: Sat, 30 May 2026 23:28:46 +0200
Subject: [PATCH] Cleanup: remove stale modules, improve libxml2 package, add
 wget dependency

- Remove old system-wide modules: modules/tibia.nix, modules/multimedia.nix
- libxml2-2.9: rename pname to libxml2-2-9 (avoid conflict), add meta
- Tibia module: add wget to home.packages (required for tibia-install)
- tibia-install: use wget directly (no fallback), since wget is now a dependency
---
 modules/home/tibia.nix           |  10 +--
 modules/multimedia.nix           |   7 --
 modules/tibia.nix                | 138 -------------------------------
 packages/libxml2-2.9/default.nix |   8 +-
 4 files changed, 9 insertions(+), 154 deletions(-)
 delete mode 100644 modules/multimedia.nix
 delete mode 100644 modules/tibia.nix

diff --git a/modules/home/tibia.nix b/modules/home/tibia.nix
index 47078d7..9e40558 100644
--- a/modules/home/tibia.nix
+++ b/modules/home/tibia.nix
@@ -106,14 +106,7 @@ TIBIA_WRAPPER
     trap "rm -rf $TMPDIR" EXIT
 
     echo "Downloading Tibia launcher from $URL ..."
-    if command -v wget &>/dev/null; then
-      wget -q --show-progress -O "$TMPDIR/tibia.tar.gz" "$URL"
-    elif command -v curl &>/dev/null; then
-      curl -# -L -o "$TMPDIR/tibia.tar.gz" "$URL"
-    else
-      echo "Neither wget nor curl found."
-      exit 1
-    fi
+    wget -q --show-progress -O "$TMPDIR/tibia.tar.gz" "$URL"
 
     mkdir -p "$DEST"
     tar xzf "$TMPDIR/tibia.tar.gz" -C "$DEST"
@@ -142,6 +135,7 @@ in {
     home.packages = with pkgs; [
       steam-run
       libxml2_2_9
+      wget
       tibiaClientWrapper
       tibiaPatcher
       tibiaLauncherWrapper
diff --git a/modules/multimedia.nix b/modules/multimedia.nix
deleted file mode 100644
index 91605bf..0000000
--- a/modules/multimedia.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }: {
-
-  # paczki
-  environment.systemPackages = with pkgs; [
-  	vlc
-  ];
-}
diff --git a/modules/tibia.nix b/modules/tibia.nix
deleted file mode 100644
index dd2cfaa..0000000
--- a/modules/tibia.nix
+++ /dev/null
@@ -1,138 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  # ────────────────────────────────────────────────────────────────
-  # Legacy libxml2 (2.9.x) — Tibia requires libxml2.so.2
-  # ────────────────────────────────────────────────────────────────
-  libxml2_2_9 = pkgs.stdenv.mkDerivation {
-    pname = "libxml2-2.9";
-    version = "2.9.14";
-
-    src = pkgs.fetchurl {
-      url = "https://download.gnome.org/sources/libxml2/2.9/libxml2-2.9.14.tar.xz";
-      sha256 = "sha256-YNdKJX0czsBHXnScui8hVZ5IE577pv8oIkNXx8eY3+4=";
-    };
-
-    nativeBuildInputs = [ pkgs.pkg-config ];
-    buildInputs = [ pkgs.zlib pkgs.xz ];
-
-    configureFlags = [
-      "--disable-static"
-      "--without-python"
-    ];
-
-    enableParallelBuilding = true;
-  };
-
-  # ────────────────────────────────────────────────────────────────
-  # Centralized runtime library path for Tibia
-  # ────────────────────────────────────────────────────────────────
-  tibiaLibPath = lib.makeLibraryPath [
-    pkgs.nss
-    pkgs.nspr
-    pkgs.libxkbfile
-    libxml2_2_9
-  ];
-
-  exportLibs = ''
-    export LD_LIBRARY_PATH="${tibiaLibPath}:$LD_LIBRARY_PATH"
-  '';
-
-  # ────────────────────────────────────────────────────────────────
-  # System-wide wrapper for the Tibia client binary
-  # ────────────────────────────────────────────────────────────────
-  tibiaClientWrapper = pkgs.writeShellScriptBin "tibia-client" ''
-    #!/usr/bin/env bash
-    ${exportLibs}
-    exec steam-run "$HOME/.local/share/CipSoft GmbH/Tibia/packages/Tibia/bin/client" "$@"
-  '';
-
-  # ────────────────────────────────────────────────────────────────
-  # Patcher for Tibia's package.json (launcher → wrapper redirect)
-  # ────────────────────────────────────────────────────────────────
-  tibiaPatcher = pkgs.writeShellScriptBin "tibia-patch" ''
-    #!/usr/bin/env bash
-    set -e
-
-    PKGDIR="$HOME/.local/share/CipSoft GmbH/Tibia/packages/Tibia"
-    PKGJSON="$PKGDIR/package.json"
-    LOCALWRAPPER="$PKGDIR/tibia-client-wrapper"
-
-    if [ ! -f "$PKGJSON" ]; then
-      echo "package.json not found — run the launcher once first."
-      exit 0
-    fi
-
-    cat > "$LOCALWRAPPER" <<EOF
-#!/usr/bin/env bash
-${exportLibs}
-exec /run/current-system/sw/bin/tibia-client "\$@"
-EOF
-    chmod +x "$LOCALWRAPPER"
-
-    sed -i 's#"executable": "bin/client"#"executable": "tibia-client-wrapper"#' "$PKGJSON"
-
-    echo "Tibia client patched to use tibia-client-wrapper."
-  '';
-
-  # ────────────────────────────────────────────────────────────────
-  # Wrapper for the Tibia launcher (runs patcher + launcher)
-  # ────────────────────────────────────────────────────────────────
-  tibiaLauncherWrapper = pkgs.writeShellScriptBin "tibia" ''
-    #!/usr/bin/env bash
-    set -e
-
-    LAUNCHER="$HOME/Gry/Tibia/Tibia"
-
-    if [ ! -x "$LAUNCHER" ]; then
-      echo "Tibia launcher not found at:"
-      echo "  $LAUNCHER"
-      exit 1
-    fi
-
-    tibia-patch
-
-    ${exportLibs}
-    exec steam-run "$LAUNCHER"
-  '';
-
-  # ────────────────────────────────────────────────────────────────
-  # Desktop icon (copied from ~/Gry/Tibia/tibia.ico)
-  # ────────────────────────────────────────────────────────────────
-  tibiaIcon = pkgs.runCommand "tibia-icon" {} ''
-    mkdir -p $out/share/icons/hicolor/256x256/apps
-    cp "${/home/sasza/Gry/Tibia/tibia.ico}" \
-       "$out/share/icons/hicolor/256x256/apps/tibia.ico"
-  '';
-
-  # ────────────────────────────────────────────────────────────────
-  # Desktop entry for Tibia
-  # ────────────────────────────────────────────────────────────────
-  tibiaDesktop = pkgs.writeTextFile {
-    name = "tibia.desktop";
-    destination = "/share/applications/tibia.desktop";
-    text = ''
-      [Desktop Entry]
-      Type=Application
-      Name=Tibia
-      Comment=Launch the Tibia MMORPG
-      Exec=tibia
-      Icon=tibia.ico
-      Terminal=false
-      Categories=Game;RolePlaying;
-    '';
-  };
-
-in
-{
-  environment.systemPackages = [
-    pkgs.steam-run
-    libxml2_2_9
-    tibiaClientWrapper
-    tibiaPatcher
-    tibiaLauncherWrapper
-    tibiaIcon
-    tibiaDesktop
-  ];
-}
-
diff --git a/packages/libxml2-2.9/default.nix b/packages/libxml2-2.9/default.nix
index 96487ca..17e5ceb 100644
--- a/packages/libxml2-2.9/default.nix
+++ b/packages/libxml2-2.9/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkg-config, zlib, xz }:
 
 stdenv.mkDerivation {
-  pname = "libxml2";
+  pname = "libxml2-2-9";
   version = "2.9.14";
 
   src = fetchurl {
@@ -18,4 +18,10 @@ stdenv.mkDerivation {
   ];
 
   enableParallelBuilding = true;
+
+  meta = {
+    description = "Legacy libxml2 2.9.14, required by Tibia client";
+    homepage = "http://xmlsoft.org/";
+    license = stdenv.lib.licenses.mit;
+  };
 }